diff --git a/public/admin/tests/external/set_block_protection_test.php b/public/admin/tests/external/set_block_protection_test.php index 43cbfe032bb..da6b6bb7ff9 100644 --- a/public/admin/tests/external/set_block_protection_test.php +++ b/public/admin/tests/external/set_block_protection_test.php @@ -18,11 +18,6 @@ declare(strict_types=1); namespace core_admin\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Unit tests to test block protection changes. * @@ -31,7 +26,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Andrew Lyons * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class set_block_protection_test extends \externallib_advanced_testcase { +final class set_block_protection_test extends \core_external\tests\externallib_testcase { /** * Test execute method with no login. */ diff --git a/public/admin/tests/external/set_plugin_order_test.php b/public/admin/tests/external/set_plugin_order_test.php index d05886c5617..685230e7d5b 100644 --- a/public/admin/tests/external/set_plugin_order_test.php +++ b/public/admin/tests/external/set_plugin_order_test.php @@ -18,11 +18,6 @@ declare(strict_types=1); namespace core_admin\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Unit tests to configure the plugin order. * @@ -33,7 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Andrew Lyons * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class set_plugin_order_test extends \externallib_advanced_testcase { +final class set_plugin_order_test extends \core_external\tests\externallib_testcase { /** * Text execute method for editor plugins, which support ordering. * diff --git a/public/admin/tests/external/set_plugin_state_test.php b/public/admin/tests/external/set_plugin_state_test.php index e249174f52e..3d10e04f99c 100644 --- a/public/admin/tests/external/set_plugin_state_test.php +++ b/public/admin/tests/external/set_plugin_state_test.php @@ -18,11 +18,6 @@ declare(strict_types=1); namespace core_admin\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Unit tests to configure the enabled/disabled state of a plugin. * @@ -31,7 +26,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Andrew Lyons * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class set_plugin_state_test extends \externallib_advanced_testcase { +final class set_plugin_state_test extends \core_external\tests\externallib_testcase { /** * Text execute method. * diff --git a/public/admin/tool/analytics/tests/external/external_test.php b/public/admin/tool/analytics/tests/external/external_test.php index c7a44607f22..5896b142191 100644 --- a/public/admin/tool/analytics/tests/external/external_test.php +++ b/public/admin/tool/analytics/tests/external/external_test.php @@ -26,13 +26,10 @@ namespace tool_analytics\external; -use externallib_advanced_testcase; - defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/analytics/tests/fixtures/test_indicator_max.php'); require_once($CFG->dirroot . '/analytics/tests/fixtures/test_target_course_level_shortname.php'); @@ -45,8 +42,7 @@ require_once($CFG->dirroot . '/analytics/tests/fixtures/test_target_course_level * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.8 */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { /** * test_potential_contexts description */ diff --git a/public/admin/tool/dataprivacy/tests/external/external_test.php b/public/admin/tool/dataprivacy/tests/external/external_test.php index ee80d67f3ce..044ca9d209d 100644 --- a/public/admin/tool/dataprivacy/tests/external/external_test.php +++ b/public/admin/tool/dataprivacy/tests/external/external_test.php @@ -14,28 +14,14 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External tests. - * - * @package tool_dataprivacy - * @copyright 2018 Jun Pataleta - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - namespace tool_dataprivacy\external; use core_external\external_api; -use externallib_advanced_testcase; use tool_dataprivacy\api; use tool_dataprivacy\data_request; use tool_dataprivacy\context_instance; use tool_dataprivacy\external; -defined('MOODLE_INTERNAL') || die(); -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External testcase. * @@ -43,8 +29,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2018 Jun Pataleta * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { /** * Test for external::approve_data_request() with the user not logged in. */ diff --git a/public/admin/tool/dataprivacy/tests/external/submit_selected_courses_form_test.php b/public/admin/tool/dataprivacy/tests/external/submit_selected_courses_form_test.php index 32ec94521ac..872b5f11648 100644 --- a/public/admin/tool/dataprivacy/tests/external/submit_selected_courses_form_test.php +++ b/public/admin/tool/dataprivacy/tests/external/submit_selected_courses_form_test.php @@ -14,21 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * This is the external method for submit selected courses. - * - * @package tool_dataprivacy - * @copyright 2021 The Open University - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - namespace tool_dataprivacy\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - use tool_dataprivacy\api; /** @@ -39,7 +26,7 @@ use tool_dataprivacy\api; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \tool_dataprivacy\api */ -final class submit_selected_courses_form_test extends \externallib_advanced_testcase { +final class submit_selected_courses_form_test extends \core_external\tests\externallib_testcase { /** * Test for submit_selected_courses_form(). */ diff --git a/public/admin/tool/lp/tests/externallib_test.php b/public/admin/tool/lp/tests/externallib_test.php index 587b01935c9..e01a25fe065 100644 --- a/public/admin/tool/lp/tests/externallib_test.php +++ b/public/admin/tool/lp/tests/externallib_test.php @@ -18,13 +18,6 @@ namespace tool_lp; use core_competency\api; use core_external\external_api; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External learning plans webservice API tests. @@ -33,8 +26,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2015 Damyon Wiese * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** @var \stdClass $creator User with enough permissions to create insystem context. */ protected $creator = null; diff --git a/public/admin/tool/mobile/tests/api_test.php b/public/admin/tool/mobile/tests/api_test.php index ea6323fc820..82ea83e33fd 100644 --- a/public/admin/tool/mobile/tests/api_test.php +++ b/public/admin/tool/mobile/tests/api_test.php @@ -16,12 +16,6 @@ namespace tool_mobile; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Moodle Mobile admin tool api tests. * @@ -30,8 +24,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.1 */ -final class api_test extends \externallib_advanced_testcase { - +final class api_test extends \core_external\tests\externallib_testcase { /** * Test get_autologin_key. */ diff --git a/public/admin/tool/mobile/tests/externallib_test.php b/public/admin/tool/mobile/tests/externallib_test.php index d3e91bbbac2..69720ceab4c 100644 --- a/public/admin/tool/mobile/tests/externallib_test.php +++ b/public/admin/tool/mobile/tests/externallib_test.php @@ -16,14 +16,12 @@ namespace tool_mobile; -use externallib_advanced_testcase; use core_external\external_api; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/admin/tool/mobile/tests/fixtures/output/mobile.php'); require_once($CFG->dirroot . '/webservice/lib.php'); @@ -35,8 +33,7 @@ require_once($CFG->dirroot . '/webservice/lib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.1 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test get_plugins_supporting_mobile. * This is a very basic test because currently there aren't plugins supporting Mobile in core. diff --git a/public/admin/tool/policy/tests/externallib_test.php b/public/admin/tool/policy/tests/externallib_test.php index 595b5d22f9e..7d743592716 100644 --- a/public/admin/tool/policy/tests/externallib_test.php +++ b/public/admin/tool/policy/tests/externallib_test.php @@ -16,14 +16,12 @@ namespace tool_policy; -use externallib_advanced_testcase; use tool_mobile\external as external_mobile; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/user/externallib.php'); /** @@ -33,8 +31,7 @@ require_once($CFG->dirroot . '/user/externallib.php'); * @copyright 2018 Sara Arjona * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** @var \tool_policy\policy_version $policy1 Policy document 1. */ protected $policy1; diff --git a/public/admin/tool/templatelibrary/tests/externallib_test.php b/public/admin/tool/templatelibrary/tests/externallib_test.php index 16dbbc4768b..c1b0b626459 100644 --- a/public/admin/tool/templatelibrary/tests/externallib_test.php +++ b/public/admin/tool/templatelibrary/tests/externallib_test.php @@ -16,14 +16,6 @@ namespace tool_templatelibrary; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External learning plans webservice API tests. * @@ -31,8 +23,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2015 Damyon Wiese * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test list all. */ diff --git a/public/auth/email/tests/external/external_test.php b/public/auth/email/tests/external/external_test.php index 3e176307386..0d63f1b9a1c 100644 --- a/public/auth/email/tests/external/external_test.php +++ b/public/auth/email/tests/external/external_test.php @@ -14,26 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * Auth email external functions tests. - * - * @package auth_email - * @category external - * @copyright 2016 Juan Leyva - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 3.2 - */ - namespace auth_email\external; use auth_email_external; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External auth email API tests. @@ -43,8 +26,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.2 */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { /** @var int custom profile field1 ID. */ protected $field1; diff --git a/public/auth/tests/external/external_test.php b/public/auth/tests/external/external_test.php index 3aa3c459f6e..d6f36576c66 100644 --- a/public/auth/tests/external/external_test.php +++ b/public/auth/tests/external/external_test.php @@ -14,28 +14,11 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * Auth external functions tests. - * - * @package core_auth - * @category external - * @copyright 2016 Juan Leyva - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 3.2 - */ - namespace core_auth\external; use auth_email_external; use core_auth_external; use core_external\external_api; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External auth API tests. @@ -45,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.2 */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { /** @var string Original error log */ protected $oldlog; diff --git a/public/backup/tests/externallib_test.php b/public/backup/tests/externallib_test.php index b47808804e9..163ae765ac1 100644 --- a/public/backup/tests/externallib_test.php +++ b/public/backup/tests/externallib_test.php @@ -19,14 +19,12 @@ namespace core_backup; use backup; use core_backup_external; use core_external\external_api; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php'); require_once($CFG->dirroot . '/backup/util/includes/restore_includes.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/backup/externallib.php'); /** @@ -37,8 +35,7 @@ require_once($CFG->dirroot . '/backup/externallib.php'); * @author Matt Porritt * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Set up tasks for all tests. */ diff --git a/public/badges/tests/external/disable_badges_test.php b/public/badges/tests/external/disable_badges_test.php index 397dc6f2a0c..ffcd4654265 100644 --- a/public/badges/tests/external/disable_badges_test.php +++ b/public/badges/tests/external/disable_badges_test.php @@ -18,13 +18,11 @@ namespace core_badges\external; use core_badges_generator; use core_badges\badge; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->libdir . '/badgeslib.php'); /** @@ -36,8 +34,7 @@ require_once($CFG->libdir . '/badgeslib.php'); * @since Moodle 4.5 * @covers \core_badges\external\disable_badges */ -final class disable_badges_test extends externallib_advanced_testcase { - +final class disable_badges_test extends \core_external\tests\externallib_testcase { /** * Test execute method. */ diff --git a/public/badges/tests/external/enable_badges_test.php b/public/badges/tests/external/enable_badges_test.php index 891ac305bd6..26b4f4c48da 100644 --- a/public/badges/tests/external/enable_badges_test.php +++ b/public/badges/tests/external/enable_badges_test.php @@ -18,13 +18,11 @@ namespace core_badges\external; use core_badges_generator; use core_badges\badge; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->libdir . '/badgeslib.php'); /** @@ -36,8 +34,7 @@ require_once($CFG->libdir . '/badgeslib.php'); * @since Moodle 4.5 * @covers \core_badges\external\enable_badges */ -final class enable_badges_test extends externallib_advanced_testcase { - +final class enable_badges_test extends \core_external\tests\externallib_testcase { /** * Test execute method. */ diff --git a/public/badges/tests/external/external_test.php b/public/badges/tests/external/external_test.php index 5fdcada9d2e..aea0dfa0c88 100644 --- a/public/badges/tests/external/external_test.php +++ b/public/badges/tests/external/external_test.php @@ -30,13 +30,11 @@ use core_badges_external; use core_badges\tests\external_helper; use core_external\external_api; use core_external\external_settings; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->libdir . '/badgeslib.php'); /** @@ -48,7 +46,7 @@ require_once($CFG->libdir . '/badgeslib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.1 */ -final class external_test extends externallib_advanced_testcase { +final class external_test extends \core_external\tests\externallib_testcase { use external_helper; /** diff --git a/public/badges/tests/external/get_badge_test.php b/public/badges/tests/external/get_badge_test.php index a236d023da8..80ed1cd27cc 100644 --- a/public/badges/tests/external/get_badge_test.php +++ b/public/badges/tests/external/get_badge_test.php @@ -17,13 +17,6 @@ namespace core_badges\external; use core_badges\tests\external_helper; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * Tests for external function get_badge. @@ -36,7 +29,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @since Moodle 4.5 * @coversDefaultClass \core_badges\external\get_badge */ -final class get_badge_test extends externallib_advanced_testcase { +final class get_badge_test extends \core_external\tests\externallib_testcase { use external_helper; /** diff --git a/public/badges/tests/external/get_user_badge_by_hash_test.php b/public/badges/tests/external/get_user_badge_by_hash_test.php index ba3a9164579..f76b1b601ef 100644 --- a/public/badges/tests/external/get_user_badge_by_hash_test.php +++ b/public/badges/tests/external/get_user_badge_by_hash_test.php @@ -17,13 +17,6 @@ namespace core_badges\external; use core_badges\tests\external_helper; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * Tests for external function get_user_badge_by_hash. @@ -35,7 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @since Moodle 4.3 * @coversDefaultClass \core_badges\external\get_user_badge_by_hash */ -final class get_user_badge_by_hash_test extends externallib_advanced_testcase { +final class get_user_badge_by_hash_test extends \core_external\tests\externallib_testcase { use external_helper; /** diff --git a/public/blocks/recentlyaccesseditems/tests/externallib_test.php b/public/blocks/recentlyaccesseditems/tests/externallib_test.php index 4110d8d620a..1a956aa6d83 100644 --- a/public/blocks/recentlyaccesseditems/tests/externallib_test.php +++ b/public/blocks/recentlyaccesseditems/tests/externallib_test.php @@ -16,14 +16,6 @@ namespace block_recentlyaccesseditems; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Test Recently accessed items block external functions * @@ -33,8 +25,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.6 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test the get_recent_items function. */ diff --git a/public/blocks/tests/externallib_test.php b/public/blocks/tests/externallib_test.php index 32fa4f15a13..2825b10a062 100644 --- a/public/blocks/tests/externallib_test.php +++ b/public/blocks/tests/externallib_test.php @@ -17,13 +17,11 @@ namespace core_block; use core_block_external; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/my/lib.php'); /** @@ -35,8 +33,7 @@ require_once($CFG->dirroot . '/my/lib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.0 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test get_course_blocks */ diff --git a/public/blog/tests/external/external_test.php b/public/blog/tests/external/external_test.php index e8222ac571f..e7176a0267e 100644 --- a/public/blog/tests/external/external_test.php +++ b/public/blog/tests/external/external_test.php @@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/blog/locallib.php'); require_once($CFG->dirroot . '/blog/lib.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); + /** * Unit tests for blog external API. @@ -40,8 +40,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2018 Juan Leyva * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class external_test extends \externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { private $courseid; private $cmid; private $userid; diff --git a/public/calendar/tests/externallib_test.php b/public/calendar/tests/externallib_test.php index 3e68231e2d9..53d24461d62 100644 --- a/public/calendar/tests/externallib_test.php +++ b/public/calendar/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace core_calendar; use core_calendar_external; -use externallib_advanced_testcase; use core_external\external_api; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External course functions unit tests * @@ -35,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.5 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Tests set up */ diff --git a/public/cohort/tests/externallib_test.php b/public/cohort/tests/externallib_test.php index b5b0b2d96db..8f5453c1c91 100644 --- a/public/cohort/tests/externallib_test.php +++ b/public/cohort/tests/externallib_test.php @@ -16,16 +16,14 @@ namespace core_cohort; +use core_cohort\customfield\cohort_handler; use core_cohort_external; use core_external\external_api; -use externallib_advanced_testcase; -use core_cohort\customfield\cohort_handler; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/cohort/externallib.php'); /** @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/cohort/externallib.php'); * @copyright MediaTouch 2000 srl * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Create cohort custom fields for testing. */ diff --git a/public/comment/tests/externallib_test.php b/public/comment/tests/externallib_test.php index 8614b61807a..7a39c5a6d90 100644 --- a/public/comment/tests/externallib_test.php +++ b/public/comment/tests/externallib_test.php @@ -19,13 +19,6 @@ namespace core_comment; use core_comment\comment_exception; use core_comment_external; use core_external\external_api; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External comment functions unit tests @@ -36,8 +29,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.9 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Tests set up */ diff --git a/public/competency/tests/competency_rule_test.php b/public/competency/tests/competency_rule_test.php index 2e5886e998e..a474cd55774 100644 --- a/public/competency/tests/competency_rule_test.php +++ b/public/competency/tests/competency_rule_test.php @@ -16,11 +16,6 @@ namespace core_competency; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Competency rule testcase. * @@ -28,8 +23,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2015 Frédéric Massart - FMCorz.net * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class competency_rule_test extends \externallib_advanced_testcase { - +final class competency_rule_test extends \core_external\tests\externallib_testcase { public function test_rule_all_matching(): void { $this->resetAfterTest(true); diff --git a/public/competency/tests/external/external_test.php b/public/competency/tests/external/external_test.php index 1fd10fcfc59..fcae6a38688 100644 --- a/public/competency/tests/external/external_test.php +++ b/public/competency/tests/external/external_test.php @@ -36,12 +36,6 @@ use core_competency\template_competency; use core_competency\user_competency; use core_competency\user_competency_plan; use core_external\external_api; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External testcase. @@ -50,8 +44,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2016 Frédéric Massart - FMCorz.net * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { /** @var \stdClass $creator User with enough permissions to create insystem context. */ protected $creator = null; diff --git a/public/completion/tests/externallib_test.php b/public/completion/tests/externallib_test.php index c4b401bf79d..768d6f4a474 100644 --- a/public/completion/tests/externallib_test.php +++ b/public/completion/tests/externallib_test.php @@ -18,13 +18,6 @@ namespace core_completion; use core_completion_external; use core_external\external_api; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External completion functions unit tests @@ -36,8 +29,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @since Moodle 2.9 * @coversDefaultClass \core_completion_external */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test update_activity_completion_status_manually */ diff --git a/public/contentbank/tests/external/copy_content_test.php b/public/contentbank/tests/external/copy_content_test.php index 61533e39585..1a17f23e02d 100644 --- a/public/contentbank/tests/external/copy_content_test.php +++ b/public/contentbank/tests/external/copy_content_test.php @@ -19,9 +19,9 @@ namespace core_contentbank\external; defined('MOODLE_INTERNAL') || die(); global $CFG; + require_once($CFG->dirroot . '/contentbank/tests/fixtures/testable_contenttype.php'); require_once($CFG->dirroot . '/contentbank/tests/fixtures/testable_content.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); use core_external\external_api; @@ -33,8 +33,7 @@ use core_external\external_api; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_contentbank\external\copy_content */ -final class copy_content_test extends \externallib_advanced_testcase { - +final class copy_content_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of copy_content() for users with permission. * diff --git a/public/contentbank/tests/external/delete_content_test.php b/public/contentbank/tests/external/delete_content_test.php index 2324aea327a..2adb9b2791e 100644 --- a/public/contentbank/tests/external/delete_content_test.php +++ b/public/contentbank/tests/external/delete_content_test.php @@ -29,12 +29,10 @@ namespace core_contentbank\external; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); + require_once($CFG->dirroot . '/contentbank/tests/fixtures/testable_content.php'); -use dml_missing_record_exception; use core_external\external_api; -use externallib_advanced_testcase; /** * External function test for delete_content. @@ -43,8 +41,7 @@ use externallib_advanced_testcase; * @copyright 2020 Sara Arjona * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_content_test extends externallib_advanced_testcase { - +final class delete_content_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of delete_content(). */ diff --git a/public/contentbank/tests/external/rename_content_test.php b/public/contentbank/tests/external/rename_content_test.php index 44ec25bde28..7c62e239823 100644 --- a/public/contentbank/tests/external/rename_content_test.php +++ b/public/contentbank/tests/external/rename_content_test.php @@ -31,7 +31,6 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/contentbank/tests/fixtures/testable_contenttype.php'); require_once($CFG->dirroot . '/contentbank/tests/fixtures/testable_content.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); use core_external\external_api; @@ -43,8 +42,7 @@ use core_external\external_api; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_contentbank\external\rename_content */ -final class rename_content_test extends \externallib_advanced_testcase { - +final class rename_content_test extends \core_external\tests\externallib_testcase { /** * Data provider for test_rename_content. * diff --git a/public/course/format/tests/external/create_module_test.php b/public/course/format/tests/external/create_module_test.php index 33b69784ef6..156fca3fad4 100644 --- a/public/course/format/tests/external/create_module_test.php +++ b/public/course/format/tests/external/create_module_test.php @@ -18,14 +18,9 @@ declare(strict_types=1); namespace core_courseformat\external; -defined('MOODLE_INTERNAL') || die(); - use moodle_exception; use stdClass; -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the create_module class. * @@ -35,17 +30,14 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_courseformat\external\create_module */ -final class create_module_test extends \externallib_advanced_testcase { +final class create_module_test extends \core_external\tests\externallib_testcase { + #[\Override] + public static function setUpBeforeClass(): void { + parent::setUpBeforeClass(); - /** - * Setup to ensure that fixtures are loaded. - */ - public static function setupBeforeClass(): void { // phpcs:ignore - global $CFG; - - require_once($CFG->dirroot . '/course/format/tests/fixtures/format_theunittest.php'); - require_once($CFG->dirroot . '/course/format/tests/fixtures/format_theunittest_output_course_format_state.php'); - require_once($CFG->dirroot . '/course/format/tests/fixtures/format_theunittest_stateactions.php'); + self::load_fixture('courseformat', 'format_theunittest.php'); + self::load_fixture('courseformat', 'format_theunittest_output_course_format_state.php'); + self::load_fixture('courseformat', 'format_theunittest_stateactions.php'); } /** diff --git a/public/course/format/tests/external/delete_section_test.php b/public/course/format/tests/external/delete_section_test.php index 68eb7a18fd5..e9ca4fddd0c 100644 --- a/public/course/format/tests/external/delete_section_test.php +++ b/public/course/format/tests/external/delete_section_test.php @@ -18,14 +18,9 @@ declare(strict_types=1); namespace core_courseformat\external; -defined('MOODLE_INTERNAL') || die(); - use core_courseformat\stateactions; use core_courseformat\stateupdates; -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the delete section test class. * @@ -35,8 +30,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_courseformat\stateactions */ -final class delete_section_test extends \externallib_advanced_testcase { - +final class delete_section_test extends \core_external\tests\externallib_testcase { /** * Test the webservice can execute the section_delete action. * diff --git a/public/course/format/tests/external/file_handlers_test.php b/public/course/format/tests/external/file_handlers_test.php index a2dcec7ff4e..ee649000b42 100644 --- a/public/course/format/tests/external/file_handlers_test.php +++ b/public/course/format/tests/external/file_handlers_test.php @@ -28,8 +28,8 @@ use core_external\external_api; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_courseformat\external\file_handlers */ -final class file_handlers_test extends \externallib_advanced_testcase { - +#[\PHPUnit\Framework\Attributes\CoversClass(file_handlers::class)] +final class file_handlers_test extends \core_external\tests\externallib_testcase { /** * Setup to ensure that fixtures are loaded. */ @@ -40,8 +40,6 @@ final class file_handlers_test extends \externallib_advanced_testcase { /** * Test the behaviour of get_state::execute(). - * - * @covers ::execute */ public function test_execute(): void { $this->resetAfterTest(); @@ -63,8 +61,6 @@ final class file_handlers_test extends \externallib_advanced_testcase { /** * Test the behaviour of get_state::execute() in a wrong course. - * - * @covers ::execute */ public function test_execute_wrong_course(): void { $this->resetAfterTest(); diff --git a/public/course/format/tests/external/get_overview_information_test.php b/public/course/format/tests/external/get_overview_information_test.php index 2b48b0b7199..f626a98cf40 100644 --- a/public/course/format/tests/external/get_overview_information_test.php +++ b/public/course/format/tests/external/get_overview_information_test.php @@ -16,11 +16,6 @@ namespace core_courseformat\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - use core_external\external_api; use stdClass; @@ -33,7 +28,7 @@ use stdClass; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \core_courseformat\external\get_overview_information */ -final class get_overview_information_test extends \externallib_advanced_testcase { +final class get_overview_information_test extends \core_external\tests\externallib_testcase { public function test_get_overview_information(): void { $this->resetAfterTest(); diff --git a/public/course/format/tests/external/get_state_test.php b/public/course/format/tests/external/get_state_test.php index c5a05469363..bbaa8bad795 100644 --- a/public/course/format/tests/external/get_state_test.php +++ b/public/course/format/tests/external/get_state_test.php @@ -16,11 +16,6 @@ namespace core_courseformat\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - use core_external\external_api; /** @@ -32,8 +27,7 @@ use core_external\external_api; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_courseformat\external\get_state */ -final class get_state_test extends \externallib_advanced_testcase { - +final class get_state_test extends \core_external\tests\externallib_testcase { /** @var array Sections in the testing course. */ private $sections; diff --git a/public/course/format/tests/external/log_view_overview_information_test.php b/public/course/format/tests/external/log_view_overview_information_test.php index 5872e715cf1..47bda0c8099 100644 --- a/public/course/format/tests/external/log_view_overview_information_test.php +++ b/public/course/format/tests/external/log_view_overview_information_test.php @@ -16,11 +16,6 @@ namespace core_courseformat\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - use core_external\external_api; /** @@ -32,7 +27,7 @@ use core_external\external_api; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ #[\PHPUnit\Framework\Attributes\CoversClass(log_view_overview_information::class)] -final class log_view_overview_information_test extends \externallib_advanced_testcase { +final class log_view_overview_information_test extends \core_external\tests\externallib_testcase { /** * Test for webservice log_view_overview_information base cases. * diff --git a/public/course/format/tests/external/new_module_test.php b/public/course/format/tests/external/new_module_test.php index d7adafbf588..6e66e341dc9 100644 --- a/public/course/format/tests/external/new_module_test.php +++ b/public/course/format/tests/external/new_module_test.php @@ -18,14 +18,9 @@ declare(strict_types=1); namespace core_courseformat\external; -defined('MOODLE_INTERNAL') || die(); - -use moodle_exception; +use core\exception\moodle_exception; use stdClass; -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the new_module class. * @@ -35,17 +30,15 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_courseformat\external\new_module */ -final class new_module_test extends \externallib_advanced_testcase { - - /** - * Setup to ensure that fixtures are loaded. - */ - public static function setupBeforeClass(): void { // phpcs:ignore +final class new_module_test extends \core_external\tests\externallib_testcase { + #[\Override] + public static function setUpBeforeClass(): void { global $CFG; - require_once($CFG->dirroot . '/course/format/tests/fixtures/format_theunittest.php'); - require_once($CFG->dirroot . '/course/format/tests/fixtures/format_theunittest_output_course_format_state.php'); - require_once($CFG->dirroot . '/course/format/tests/fixtures/format_theunittest_stateactions.php'); + parent::setUpBeforeClass(); + self::load_fixture('courseformat', 'format_theunittest.php'); + self::load_fixture('courseformat', 'format_theunittest_output_course_format_state.php'); + self::load_fixture('courseformat', 'format_theunittest_stateactions.php'); } /** diff --git a/public/course/format/tests/external/update_course_test.php b/public/course/format/tests/external/update_course_test.php index 7aec089abd2..adaed6f1770 100644 --- a/public/course/format/tests/external/update_course_test.php +++ b/public/course/format/tests/external/update_course_test.php @@ -16,13 +16,8 @@ namespace core_courseformat\external; +use core\exception\moodle_exception; use stdClass; -use moodle_exception; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * Tests for the update_course class. @@ -33,17 +28,13 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_courseformat\external\update_course */ -final class update_course_test extends \externallib_advanced_testcase { - - /** - * Setup to ensure that fixtures are loaded. - */ - public static function setupBeforeClass(): void { - global $CFG; - - require_once($CFG->dirroot . '/course/format/tests/fixtures/format_theunittest.php'); - require_once($CFG->dirroot . '/course/format/tests/fixtures/format_theunittest_output_course_format_state.php'); - require_once($CFG->dirroot . '/course/format/tests/fixtures/format_theunittest_stateactions.php'); +final class update_course_test extends \core_external\tests\externallib_testcase { + #[\Override] + public static function setUpBeforeClass(): void { + parent::setUpBeforeClass(); + self::load_fixture('courseformat', 'format_theunittest.php'); + self::load_fixture('courseformat', 'format_theunittest_output_course_format_state.php'); + self::load_fixture('courseformat', 'format_theunittest_stateactions.php'); } /** diff --git a/public/course/tests/externallib_test.php b/public/course/tests/externallib_test.php index 157680915d6..5b722805f1e 100644 --- a/public/course/tests/externallib_test.php +++ b/public/course/tests/externallib_test.php @@ -14,22 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External course functions unit tests - * - * @package core_course - * @category external - * @copyright 2012 Jerome Mouneyrac - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - -use \core_external\external_api; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); +use core_external\external_api; /** * External course functions unit tests @@ -39,8 +24,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2012 Jerome Mouneyrac * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Tests set up */ diff --git a/public/customfield/field/number/tests/external/recalculate_test.php b/public/customfield/field/number/tests/external/recalculate_test.php index 30539a13b26..8830f2c70d4 100644 --- a/public/customfield/field/number/tests/external/recalculate_test.php +++ b/public/customfield/field/number/tests/external/recalculate_test.php @@ -21,13 +21,6 @@ namespace customfield_number\external; use core_customfield_generator; use core_external\external_api; use moodle_exception; -use stdClass; - -defined('MOODLE_INTERNAL') || die; - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * Unit tests for the customfield_number\external\recalculate. @@ -38,8 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \customfield_number\external\recalculate */ -final class recalculate_test extends \externallib_advanced_testcase { - +final class recalculate_test extends \core_external\tests\externallib_testcase { /** * Tests when teacher can not edit locked field. */ diff --git a/public/enrol/guest/tests/external/external_test.php b/public/enrol/guest/tests/external/external_test.php index 83d070d419f..3ccf19f7fbf 100644 --- a/public/enrol/guest/tests/external/external_test.php +++ b/public/enrol/guest/tests/external/external_test.php @@ -14,26 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * Self enrol external PHPunit tests - * - * @package enrol_guest - * @copyright 2015 Juan Leyva - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 3.1 - */ - namespace enrol_guest\external; use core_external\external_api; use enrol_guest_external; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * Guest enrolment external functions tests @@ -44,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.1 */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { /** * Test get_instance_info */ diff --git a/public/enrol/manual/tests/externallib_test.php b/public/enrol/manual/tests/externallib_test.php index f83b7a3756d..4a2bae3c2cf 100644 --- a/public/enrol/manual/tests/externallib_test.php +++ b/public/enrol/manual/tests/externallib_test.php @@ -17,13 +17,11 @@ namespace enrol_manual; use enrol_manual_external; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/enrol/manual/externallib.php'); /** @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/enrol/manual/externallib.php'); * @covers \enrol_manual_external * @since Moodle 2.4 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test get_enrolled_users */ diff --git a/public/enrol/meta/tests/external/add_instances_test.php b/public/enrol/meta/tests/external/add_instances_test.php index 8e7d61913e7..6933f84fe19 100644 --- a/public/enrol/meta/tests/external/add_instances_test.php +++ b/public/enrol/meta/tests/external/add_instances_test.php @@ -18,10 +18,6 @@ namespace enrol_meta\external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die(); -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for add_instances external class * @@ -31,8 +27,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2021 WKS KV Bildung * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class add_instances_test extends \externallib_advanced_testcase { - +final class add_instances_test extends \core_external\tests\externallib_testcase { /** * Test setup */ diff --git a/public/enrol/meta/tests/external/delete_instances_test.php b/public/enrol/meta/tests/external/delete_instances_test.php index dfdb99fdf1d..b1234cc7c49 100644 --- a/public/enrol/meta/tests/external/delete_instances_test.php +++ b/public/enrol/meta/tests/external/delete_instances_test.php @@ -18,10 +18,6 @@ namespace enrol_meta\external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die(); -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for delete_instances external class * @@ -31,8 +27,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2021 WKS KV Bildung * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_instances_test extends \externallib_advanced_testcase { - +final class delete_instances_test extends \core_external\tests\externallib_testcase { /** * Test setup */ diff --git a/public/enrol/self/tests/externallib_test.php b/public/enrol/self/tests/externallib_test.php index 1ff7c050d03..6ad66bf9d85 100644 --- a/public/enrol/self/tests/externallib_test.php +++ b/public/enrol/self/tests/externallib_test.php @@ -18,13 +18,11 @@ namespace enrol_self; use core_external\external_api; use enrol_self_external; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/enrol/self/externallib.php'); /** @@ -35,8 +33,7 @@ require_once($CFG->dirroot . '/enrol/self/externallib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.6 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test get_instance_info */ diff --git a/public/enrol/tests/externallib_test.php b/public/enrol/tests/externallib_test.php index 02c8c8e7dad..14bdf44b92b 100644 --- a/public/enrol/tests/externallib_test.php +++ b/public/enrol/tests/externallib_test.php @@ -19,14 +19,12 @@ namespace core_enrol; use core_enrol_external; use core_external\external_api; use enrol_user_enrolment_form; -use externallib_advanced_testcase; use stdClass; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/enrol/externallib.php'); /** @@ -38,8 +36,7 @@ require_once($CFG->dirroot . '/enrol/externallib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.4 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * dataProvider for test_get_enrolled_users_visibility(). */ diff --git a/public/enrol/tests/role_external_test.php b/public/enrol/tests/role_external_test.php index eaa75133027..3d0607e88d3 100644 --- a/public/enrol/tests/role_external_test.php +++ b/public/enrol/tests/role_external_test.php @@ -20,7 +20,6 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/enrol/externallib.php'); /** @@ -32,8 +31,7 @@ require_once($CFG->dirroot . '/enrol/externallib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 2.4 */ -final class role_external_test extends \externallib_advanced_testcase { - +final class role_external_test extends \core_external\tests\externallib_testcase { /** * Tests set up */ diff --git a/public/filter/tests/external/get_available_in_context_test.php b/public/filter/tests/external/get_available_in_context_test.php index 1f3dfad08c0..93199349b6a 100644 --- a/public/filter/tests/external/get_available_in_context_test.php +++ b/public/filter/tests/external/get_available_in_context_test.php @@ -14,26 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External filter functions unit tests. - * - * @package core_filters - * @category external - * @copyright 2017 Juan Leyva - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 3.4 - */ - namespace core_filters\external; use core_external\external_api; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External filter functions unit tests. @@ -45,7 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @since Moodle 3.4 * @covers \core_filters\external\get_available_in_context */ -final class get_available_in_context_test extends externallib_advanced_testcase { +final class get_available_in_context_test extends \core_external\tests\externallib_testcase { /** * Test execute */ diff --git a/public/grade/report/overview/tests/externallib_test.php b/public/grade/report/overview/tests/externallib_test.php index 36a32e9ebd4..9cb01706048 100644 --- a/public/grade/report/overview/tests/externallib_test.php +++ b/public/grade/report/overview/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace gradereport_overview; use core_external\external_api; -use externallib_advanced_testcase; use gradereport_overview_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Overview grade report functions unit tests * @@ -34,8 +27,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2015 Juan Leyva * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** @var \stdClass Course 1 record. */ protected $course1; diff --git a/public/grade/report/user/tests/externallib_test.php b/public/grade/report/user/tests/externallib_test.php index 6c71f52f376..74c6a7fd811 100644 --- a/public/grade/report/user/tests/externallib_test.php +++ b/public/grade/report/user/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace gradereport_user; use core_external\external_api; -use externallib_advanced_testcase; use gradereport_user\external\user as user_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * User grade report functions unit tests * @@ -34,8 +27,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2015 Juan Leyva * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Loads some data to be used by the different tests * @param int $s1grade Student 1 grade diff --git a/public/grade/tests/external/create_gradecategories_test.php b/public/grade/tests/external/create_gradecategories_test.php index 75c330b8a30..0ecbbb162f8 100644 --- a/public/grade/tests/external/create_gradecategories_test.php +++ b/public/grade/tests/external/create_gradecategories_test.php @@ -16,14 +16,8 @@ namespace core_grades\external; -use core_grades\external\create_gradecategories; use core_external\external_api; - -defined('MOODLE_INTERNAL') || die; - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); +use core_grades\external\create_gradecategories; /** * Unit tests for the core_grades\external\create_gradecategories webservice. @@ -34,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.11 */ -final class create_gradecategories_test extends \externallib_advanced_testcase { - +final class create_gradecategories_test extends \core_external\tests\externallib_testcase { /** * Test create_gradecategories. * diff --git a/public/grade/tests/external/get_feedback_test.php b/public/grade/tests/external/get_feedback_test.php index 16a14a5512a..2e083f21d09 100644 --- a/public/grade/tests/external/get_feedback_test.php +++ b/public/grade/tests/external/get_feedback_test.php @@ -16,12 +16,6 @@ namespace core_grades\external; -defined('MOODLE_INTERNAL') || die; - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Unit tests for the core_grades\external\get_feedback webservice. * @@ -32,8 +26,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @since Moodle 4.2 * @covers \core_grades\external\get_feedback */ -final class get_feedback_test extends \externallib_advanced_testcase { - +final class get_feedback_test extends \core_external\tests\externallib_testcase { /** * Test get_feedback. * diff --git a/public/grade/tests/external/get_gradable_users_test.php b/public/grade/tests/external/get_gradable_users_test.php index 4a51f33c320..772a4e84e91 100644 --- a/public/grade/tests/external/get_gradable_users_test.php +++ b/public/grade/tests/external/get_gradable_users_test.php @@ -18,12 +18,6 @@ namespace core_grades\external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die; - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Unit tests for the core_grades\external\get_gradable_users. * @@ -32,8 +26,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Ilya Tregubov * @covers \core_grades\external\get_gradable_users */ -final class get_gradable_users_test extends \externallib_advanced_testcase { - +final class get_gradable_users_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of get_gradable_users. * diff --git a/public/grade/tests/external/get_grade_tree_test.php b/public/grade/tests/external/get_grade_tree_test.php index ed25f984c3f..079f3023b3e 100644 --- a/public/grade/tests/external/get_grade_tree_test.php +++ b/public/grade/tests/external/get_grade_tree_test.php @@ -18,12 +18,6 @@ namespace core_grades\external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die; - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Unit tests for core_grades\external\get_grade_tree. * @@ -32,8 +26,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Mihail Geshoski * @covers \core_grades\external\get_grade_tree */ -final class get_grade_tree_test extends \externallib_advanced_testcase { - +final class get_grade_tree_test extends \core_external\tests\externallib_testcase { /** * Test the return value of the external function. * diff --git a/public/grade/tests/external/get_gradeitems_test.php b/public/grade/tests/external/get_gradeitems_test.php index ad5f07a6fd0..1b11f3c2cc0 100644 --- a/public/grade/tests/external/get_gradeitems_test.php +++ b/public/grade/tests/external/get_gradeitems_test.php @@ -20,12 +20,6 @@ use core_grades\external\get_gradeitems as get_gradeitems; use core_external\external_api; use grade_item; -defined('MOODLE_INTERNAL') || die; - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Unit tests for the core_grades\external\get_gradeitems. * @@ -34,7 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Mathew May * @covers \core_grades\external\get_gradeitems */ -final class get_gradeitems_test extends \externallib_advanced_testcase { +final class get_gradeitems_test extends \core_external\tests\externallib_testcase { public function test_execute(): void { $this->resetAfterTest(); $this->setAdminUser(); diff --git a/public/group/tests/externallib_test.php b/public/group/tests/externallib_test.php index 440799ec982..bd55284a22d 100644 --- a/public/group/tests/externallib_test.php +++ b/public/group/tests/externallib_test.php @@ -21,13 +21,11 @@ use core_external\external_api; use core_group\customfield\group_handler; use core_group\customfield\grouping_handler; use core_group_external; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/group/externallib.php'); require_once($CFG->dirroot . '/group/lib.php'); @@ -41,8 +39,7 @@ require_once($CFG->dirroot . '/group/lib.php'); * @since Moodle 2.4 * @covers \core_group_external */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Create group custom field for testing. * diff --git a/public/h5p/tests/external/external_test.php b/public/h5p/tests/external/external_test.php index 49d8dfcf1e5..ed55f039b4f 100644 --- a/public/h5p/tests/external/external_test.php +++ b/public/h5p/tests/external/external_test.php @@ -14,26 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * Core h5p external functions tests. - * - * @package core_h5p - * @category external - * @copyright 2019 Carlos Escobedo - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @since Moodle 3.8 - */ - namespace core_h5p\external; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - use core_h5p\external; use core_h5p\local\library\autoloader; @@ -46,8 +28,8 @@ use core_h5p\local\library\autoloader; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.8 */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { + #[\Override] protected function setUp(): void { parent::setUp(); autoloader::register(); diff --git a/public/lib/external/tests/external_externallib_test.php b/public/lib/external/tests/external_externallib_test.php index 2ceb755680c..65adf6deb70 100644 --- a/public/lib/external/tests/external_externallib_test.php +++ b/public/lib/external/tests/external_externallib_test.php @@ -17,13 +17,11 @@ namespace core; use core_external\external_api; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/lib/external/externallib.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External library functions unit tests @@ -33,8 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2012 Jerome Mouneyrac * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class external_externallib_test extends externallib_advanced_testcase { - +final class external_externallib_test extends \core_external\tests\externallib_testcase { /** * Test get_string */ diff --git a/public/lib/tests/external/check/get_result_admintree_test.php b/public/lib/tests/external/check/get_result_admintree_test.php index 82b589ad971..61ff71a2d92 100644 --- a/public/lib/tests/external/check/get_result_admintree_test.php +++ b/public/lib/tests/external/check/get_result_admintree_test.php @@ -22,18 +22,17 @@ use admin_category; use admin_root; use admin_setting_check; use admin_settingpage; -use core\check\result; -use externallib_advanced_testcase; -use required_capability_exception; use context_system; use core\check\access\guestrole; use core\check\check; use core\check\external\get_result_admintree; +use core\check\result; use core\check\security\passwordpolicy; +use required_capability_exception; use ReflectionMethod; global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); + require_once($CFG->libdir . '/adminlib.php'); /** @@ -45,8 +44,7 @@ require_once($CFG->libdir . '/adminlib.php'); * @copyright Catalyst IT, 2023 * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_result_admintree_test extends externallib_advanced_testcase { - +final class get_result_admintree_test extends \core_external\tests\externallib_testcase { /** * Sets up admin tree for the given settings. * diff --git a/public/lib/tests/external/dynamic_tabs_get_content_test.php b/public/lib/tests/external/dynamic_tabs_get_content_test.php index dd14d608677..204a72c0fb7 100644 --- a/public/lib/tests/external/dynamic_tabs_get_content_test.php +++ b/public/lib/tests/external/dynamic_tabs_get_content_test.php @@ -23,7 +23,7 @@ use core_external\external_api; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); + require_once($CFG->dirroot . '/lib/tests/fixtures/testeable_dynamic_tab.php'); /** @@ -34,8 +34,7 @@ require_once($CFG->dirroot . '/lib/tests/fixtures/testeable_dynamic_tab.php'); * @copyright 2021 David Matamoros * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class dynamic_tabs_get_content_test extends \externallib_advanced_testcase { - +final class dynamic_tabs_get_content_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/lib/tests/external/moodlenet_auth_check_test.php b/public/lib/tests/external/moodlenet_auth_check_test.php index 0bb996238fe..7a7977ecafe 100644 --- a/public/lib/tests/external/moodlenet_auth_check_test.php +++ b/public/lib/tests/external/moodlenet_auth_check_test.php @@ -20,12 +20,10 @@ defined('MOODLE_INTERNAL') || die(); use core\oauth2\api; use core_external\external_api; -use externallib_advanced_testcase; global $CFG; require_once($CFG->dirroot . '/lib/tests/moodlenet/helpers.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External functions test for moodlenet_auth_check. @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core\external\moodlenet_auth_check */ -final class moodlenet_auth_check_test extends externallib_advanced_testcase { - +final class moodlenet_auth_check_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of moodlenet_auth_check(). * diff --git a/public/lib/tests/external/moodlenet_get_share_info_activity_test.php b/public/lib/tests/external/moodlenet_get_share_info_activity_test.php index 95051883219..f33eb6e831f 100644 --- a/public/lib/tests/external/moodlenet_get_share_info_activity_test.php +++ b/public/lib/tests/external/moodlenet_get_share_info_activity_test.php @@ -18,14 +18,12 @@ namespace core\external; use core\oauth2\api; use core_external\external_api; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/lib/tests/moodlenet/helpers.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External functions test for moodlenet_get_share_info_activity. @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core\external\moodlenet_get_share_info_activity */ -final class moodlenet_get_share_info_activity_test extends externallib_advanced_testcase { - +final class moodlenet_get_share_info_activity_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of moodlenet_get_share_info_activity(). * @covers ::execute diff --git a/public/lib/tests/external/moodlenet_get_shared_course_info_test.php b/public/lib/tests/external/moodlenet_get_shared_course_info_test.php index afc85f94a60..3bf147ba3bb 100644 --- a/public/lib/tests/external/moodlenet_get_shared_course_info_test.php +++ b/public/lib/tests/external/moodlenet_get_shared_course_info_test.php @@ -18,14 +18,12 @@ namespace core\external; use core\oauth2\api; use core_external\external_api; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/lib/tests/moodlenet/helpers.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External functions test for moodlenet_get_shared_course_info. @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core\external\moodlenet_get_shared_course_info */ -final class moodlenet_get_shared_course_info_test extends externallib_advanced_testcase { - +final class moodlenet_get_shared_course_info_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of moodlenet_get_shared_course_info(). * diff --git a/public/lib/tests/external/moodlenet_send_activity_test.php b/public/lib/tests/external/moodlenet_send_activity_test.php index 5f2b1049be3..87db25bf4d4 100644 --- a/public/lib/tests/external/moodlenet_send_activity_test.php +++ b/public/lib/tests/external/moodlenet_send_activity_test.php @@ -18,14 +18,12 @@ namespace core\external; use core\oauth2\api; use core_external\external_api; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/lib/tests/moodlenet/helpers.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External functions test for moodlenet_send_activity. @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core\external\moodlenet_send_activity */ -final class moodlenet_send_activity_test extends externallib_advanced_testcase { - +final class moodlenet_send_activity_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of moodlenet_send_activity(). * diff --git a/public/lib/tests/external/moodlenet_send_course_test.php b/public/lib/tests/external/moodlenet_send_course_test.php index 49adfa4f915..b22e996b4a7 100644 --- a/public/lib/tests/external/moodlenet_send_course_test.php +++ b/public/lib/tests/external/moodlenet_send_course_test.php @@ -18,14 +18,12 @@ namespace core\external; use core\oauth2\api; use core_external\external_api; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/lib/tests/moodlenet/helpers.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External functions test for moodlenet_send_course. @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core\external\moodlenet_send_course */ -final class moodlenet_send_course_test extends externallib_advanced_testcase { - +final class moodlenet_send_course_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of moodlenet_send_course(). * diff --git a/public/lib/tests/external/output/icon_system/load_fontawesome_map_test.php b/public/lib/tests/external/output/icon_system/load_fontawesome_map_test.php index ee1e8d8bd52..8aa563610a7 100644 --- a/public/lib/tests/external/output/icon_system/load_fontawesome_map_test.php +++ b/public/lib/tests/external/output/icon_system/load_fontawesome_map_test.php @@ -14,33 +14,17 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External functions test for record_feedback_action. - * - * @package core - * @category test - * @copyright 2020 Andrew Nicols - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - namespace core\external\output\icon_system; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Class record_userfeedback_action_testcase * + * @package core * @copyright 2020 Andrew Nicols * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core\external\output\icon_system\load_fontawesome_map */ -final class load_fontawesome_map_test extends externallib_advanced_testcase { +final class load_fontawesome_map_test extends \core_external\tests\externallib_testcase { /** * Ensure that a valid theme which uses fontawesome returns a map. * diff --git a/public/lib/tests/external/record_userfeedback_action_test.php b/public/lib/tests/external/record_userfeedback_action_test.php index 47352f92ff9..fa6a214eeef 100644 --- a/public/lib/tests/external/record_userfeedback_action_test.php +++ b/public/lib/tests/external/record_userfeedback_action_test.php @@ -14,35 +14,19 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External functions test for record_feedback_action. - * - * @package core - * @category test - * @copyright 2020 Shamim Rezaie - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - namespace core\external; -defined('MOODLE_INTERNAL') || die(); - -use externallib_advanced_testcase; use context_system; -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Class record_userfeedback_action_testcase * + * @package core * @copyright 2020 Shamim Rezaie * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core\external\record_userfeedback_action */ -final class record_userfeedback_action_test extends externallib_advanced_testcase { - +final class record_userfeedback_action_test extends \core_external\tests\externallib_testcase { /** * Data provider for test_record_userfeedback_action. * diff --git a/public/lib/tests/grades_external_test.php b/public/lib/tests/grades_external_test.php index aafdd16327d..b14ab3b189d 100644 --- a/public/lib/tests/grades_external_test.php +++ b/public/lib/tests/grades_external_test.php @@ -19,12 +19,6 @@ namespace core; use core_grades_external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Grades functions unit tests * @@ -35,8 +29,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2012 Andrew Davis * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class grades_external_test extends \externallib_advanced_testcase { - +final class grades_external_test extends \core_external\tests\externallib_testcase { /** * Load initial test information * diff --git a/public/lib/tests/grading_external_test.php b/public/lib/tests/grading_external_test.php index c9cd60f1fc6..f46e206e204 100644 --- a/public/lib/tests/grading_external_test.php +++ b/public/lib/tests/grading_external_test.php @@ -19,12 +19,6 @@ namespace core; use core_grading_external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Unit tests for the grading API defined in core_grading_external class. * @@ -33,8 +27,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2013 Paul Charsley * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class grading_external_test extends \externallib_advanced_testcase { - +final class grading_external_test extends \core_external\tests\externallib_testcase { /** * Test get_definitions */ diff --git a/public/lib/xapi/tests/external/delete_state_test.php b/public/lib/xapi/tests/external/delete_state_test.php index c51cd7f273b..0670defa648 100644 --- a/public/lib/xapi/tests/external/delete_state_test.php +++ b/public/lib/xapi/tests/external/delete_state_test.php @@ -16,19 +16,13 @@ namespace core_xapi\external; -use core_xapi\xapi_exception; -use core_xapi\local\statement\item_agent; -use externallib_advanced_testcase; use core_external\external_api; use core_xapi\iri; use core_xapi\local\state; use core_xapi\local\statement\item_activity; +use core_xapi\local\statement\item_agent; use core_xapi\test_helper; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); +use core_xapi\xapi_exception; /** * Unit tests for xAPI delete state webservice. @@ -39,8 +33,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Sara Arjona (sara@moodle.com) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_state_test extends externallib_advanced_testcase { - +final class delete_state_test extends \core_external\tests\externallib_testcase { /** * Setup to ensure that fixtures are loaded. */ diff --git a/public/lib/xapi/tests/external/delete_states_test.php b/public/lib/xapi/tests/external/delete_states_test.php index 316c80c8c49..166559e644e 100644 --- a/public/lib/xapi/tests/external/delete_states_test.php +++ b/public/lib/xapi/tests/external/delete_states_test.php @@ -17,18 +17,11 @@ namespace core_xapi\external; use core\context\module; -use core_external\external_api; use core_xapi\iri; use core_xapi\local\statement\item_activity; use core_xapi\local\statement\item_agent; use core_xapi\test_helper; use core_xapi\xapi_exception; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * Unit tests for xAPI delete states webservice. @@ -39,8 +32,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Laurent David * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_states_test extends externallib_advanced_testcase { - +final class delete_states_test extends \core_external\tests\externallib_testcase { /** * Setup to ensure that fixtures are loaded. */ diff --git a/public/lib/xapi/tests/external/get_state_test.php b/public/lib/xapi/tests/external/get_state_test.php index 8c9994fa83b..f35db568e0c 100644 --- a/public/lib/xapi/tests/external/get_state_test.php +++ b/public/lib/xapi/tests/external/get_state_test.php @@ -16,19 +16,13 @@ namespace core_xapi\external; -use core_xapi\xapi_exception; -use core_xapi\local\statement\item_agent; -use externallib_advanced_testcase; use core_external\external_api; use core_xapi\iri; use core_xapi\local\state; use core_xapi\local\statement\item_activity; +use core_xapi\local\statement\item_agent; use core_xapi\test_helper; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); +use core_xapi\xapi_exception; /** * Unit tests for xAPI get state webservice. @@ -39,8 +33,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Sara Arjona (sara@moodle.com) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_state_test extends externallib_advanced_testcase { - +final class get_state_test extends \core_external\tests\externallib_testcase { /** * Setup to ensure that fixtures are loaded. */ diff --git a/public/lib/xapi/tests/external/get_states_test.php b/public/lib/xapi/tests/external/get_states_test.php index f189ea05b50..be30645eeae 100644 --- a/public/lib/xapi/tests/external/get_states_test.php +++ b/public/lib/xapi/tests/external/get_states_test.php @@ -16,19 +16,13 @@ namespace core_xapi\external; -use core_xapi\xapi_exception; -use core_xapi\local\statement\item_agent; -use externallib_advanced_testcase; use core_external\external_api; use core_xapi\iri; use core_xapi\local\state; use core_xapi\local\statement\item_activity; +use core_xapi\local\statement\item_agent; use core_xapi\test_helper; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); +use core_xapi\xapi_exception; /** * Unit tests for xAPI get states webservice. @@ -39,8 +33,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Ferran Recio * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_states_test extends externallib_advanced_testcase { - +final class get_states_test extends \core_external\tests\externallib_testcase { /** * Setup to ensure that fixtures are loaded. */ diff --git a/public/lib/xapi/tests/external/post_state_test.php b/public/lib/xapi/tests/external/post_state_test.php index b95fa81cc5b..1cacb6019b4 100644 --- a/public/lib/xapi/tests/external/post_state_test.php +++ b/public/lib/xapi/tests/external/post_state_test.php @@ -16,18 +16,12 @@ namespace core_xapi\external; -use core_xapi\xapi_exception; -use core_xapi\local\statement\item_agent; -use externallib_advanced_testcase; use core_external\external_api; use core_xapi\iri; use core_xapi\local\state; +use core_xapi\local\statement\item_agent; use core_xapi\test_helper; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); +use core_xapi\xapi_exception; /** * Unit tests for xAPI post state webservice. @@ -38,8 +32,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2023 Sara Arjona (sara@moodle.com) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class post_state_test extends externallib_advanced_testcase { - +final class post_state_test extends \core_external\tests\externallib_testcase { /** * Setup to ensure that fixtures are loaded. */ diff --git a/public/lib/xapi/tests/external/post_statement_test.php b/public/lib/xapi/tests/external/post_statement_test.php index ced5ad97ad2..e0375388877 100644 --- a/public/lib/xapi/tests/external/post_statement_test.php +++ b/public/lib/xapi/tests/external/post_statement_test.php @@ -23,22 +23,15 @@ */ namespace core_xapi\external; -use core_xapi\xapi_exception; -use core_xapi\test_helper; +use core_external\external_api; use core_xapi\external\post_statement; use core_xapi\local\statement; use core_xapi\local\statement\item_agent; use core_xapi\local\statement\item_group; use core_xapi\local\statement\item_verb; use core_xapi\local\statement\item_activity; -use externallib_advanced_testcase; -use stdClass; -use core_external\external_api; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); +use core_xapi\test_helper; +use core_xapi\xapi_exception; /** * Unit tests for xAPI statement processing webservice. @@ -48,8 +41,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2020 Ferran Recio * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class post_statement_test extends externallib_advanced_testcase { - +final class post_statement_test extends \core_external\tests\externallib_testcase { /** @var test_helper for generating valid xapi statements. */ private $testhelper; diff --git a/public/message/output/airnotifier/tests/externallib_test.php b/public/message/output/airnotifier/tests/externallib_test.php index ad3412091b7..d84ed34cf84 100644 --- a/public/message/output/airnotifier/tests/externallib_test.php +++ b/public/message/output/airnotifier/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace message_airnotifier; use core_external\external_api; -use externallib_advanced_testcase; use message_airnotifier_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External airnotifier functions unit tests * @@ -34,8 +27,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2012 Jerome Mouneyrac * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Tests set up */ diff --git a/public/message/tests/external/get_unread_notification_count_test.php b/public/message/tests/external/get_unread_notification_count_test.php index 0af5f8038bc..adb4169d299 100644 --- a/public/message/tests/external/get_unread_notification_count_test.php +++ b/public/message/tests/external/get_unread_notification_count_test.php @@ -16,14 +16,8 @@ namespace core_message\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -use core_external\external_api; +use core_message\tests\helper as testhelper; use externallib_advanced_testcase; -use \core_message\tests\helper as testhelper; /** * External function test for get_unread_notification_count. @@ -34,8 +28,7 @@ use \core_message\tests\helper as testhelper; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 4.0 */ -final class get_unread_notification_count_test extends externallib_advanced_testcase { - +final class get_unread_notification_count_test extends \core_external\tests\externallib_testcase { /** * get_unread_notification should throw an exception for an invalid user. */ diff --git a/public/message/tests/externallib_test.php b/public/message/tests/externallib_test.php index f4a92998372..80c0561a558 100644 --- a/public/message/tests/externallib_test.php +++ b/public/message/tests/externallib_test.php @@ -19,13 +19,11 @@ namespace core_message; use core_external\external_api; use core_message\tests\helper as testhelper; use core_message_external; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/message/externallib.php'); /** @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/message/externallib.php'); * @copyright 2012 Jerome Mouneyrac * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Tests set up */ diff --git a/public/mod/assign/tests/externallib_advanced_testcase.php b/public/mod/assign/tests/externallib_advanced_testcase.php index 9c717b60070..5e013f14a3f 100644 --- a/public/mod/assign/tests/externallib_advanced_testcase.php +++ b/public/mod/assign/tests/externallib_advanced_testcase.php @@ -19,7 +19,7 @@ namespace mod_assign; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); + require_once($CFG->dirroot . '/mod/assign/externallib.php'); require_once(__DIR__ . '/fixtures/testable_assign.php'); @@ -31,8 +31,7 @@ require_once(__DIR__ . '/fixtures/testable_assign.php'); * @copyright 2021 Catalyst IT * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -abstract class externallib_advanced_testcase extends \externallib_advanced_testcase { - +abstract class externallib_advanced_testcase extends \core_external\tests\externallib_testcase { /** * Create a submission for testing the get_submission_status function. * @param bool $submitforgrading whether to submit for grading the submission diff --git a/public/mod/bigbluebuttonbn/tests/external/can_join_test.php b/public/mod/bigbluebuttonbn/tests/external/can_join_test.php index ef31c83d623..2a7e9338864 100644 --- a/public/mod/bigbluebuttonbn/tests/external/can_join_test.php +++ b/public/mod/bigbluebuttonbn/tests/external/can_join_test.php @@ -21,11 +21,6 @@ use mod_bigbluebuttonbn\instance; use mod_bigbluebuttonbn\test\testcase_helper_trait; use moodle_exception; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the update_course class. * @@ -35,7 +30,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \mod_bigbluebuttonbn\external\can_join */ -final class can_join_test extends \externallib_advanced_testcase { +final class can_join_test extends \core_external\tests\externallib_testcase { use testcase_helper_trait; /** * Setup for test diff --git a/public/mod/bigbluebuttonbn/tests/external/completion_validate_test.php b/public/mod/bigbluebuttonbn/tests/external/completion_validate_test.php index 817573d862a..c7d72f9e147 100644 --- a/public/mod/bigbluebuttonbn/tests/external/completion_validate_test.php +++ b/public/mod/bigbluebuttonbn/tests/external/completion_validate_test.php @@ -21,11 +21,6 @@ use mod_bigbluebuttonbn\instance; use mod_bigbluebuttonbn\test\testcase_helper_trait; use require_login_exception; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the completion_validate class. * @@ -36,7 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @author Laurent David (laurent@call-learning.fr) * @covers \mod_bigbluebuttonbn\external\completion_validate */ -final class completion_validate_test extends \externallib_advanced_testcase { +final class completion_validate_test extends \core_external\tests\externallib_testcase { use testcase_helper_trait; /** @@ -152,4 +147,3 @@ final class completion_validate_test extends \externallib_advanced_testcase { $this->assertEmpty($returnvalue['warnings']); } } - diff --git a/public/mod/bigbluebuttonbn/tests/external/end_meeting_test.php b/public/mod/bigbluebuttonbn/tests/external/end_meeting_test.php index f979fe4aec4..ec2de60ca31 100644 --- a/public/mod/bigbluebuttonbn/tests/external/end_meeting_test.php +++ b/public/mod/bigbluebuttonbn/tests/external/end_meeting_test.php @@ -24,11 +24,6 @@ use moodle_exception; use require_login_exception; use core_external\restricted_context_exception; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the update_course class. * @@ -37,7 +32,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \mod_bigbluebuttonbn\external\end_meeting */ -final class end_meeting_test extends \externallib_advanced_testcase { +final class end_meeting_test extends \core_external\tests\externallib_testcase { use testcase_helper_trait; /** * Setup for test diff --git a/public/mod/bigbluebuttonbn/tests/external/get_bigbluebuttons_by_courses_test.php b/public/mod/bigbluebuttonbn/tests/external/get_bigbluebuttons_by_courses_test.php index 2a8fc3980cf..b97538ffab6 100644 --- a/public/mod/bigbluebuttonbn/tests/external/get_bigbluebuttons_by_courses_test.php +++ b/public/mod/bigbluebuttonbn/tests/external/get_bigbluebuttons_by_courses_test.php @@ -21,11 +21,6 @@ use mod_bigbluebuttonbn\instance; use mod_bigbluebuttonbn\test\testcase_helper_trait; use moodle_exception; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the get_bigbluebuttons_by_courses class. * @@ -36,7 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @author Laurent David (laurent@call-learning.fr) * @covers \mod_bigbluebuttonbn\external\get_bigbluebuttonbns_by_courses */ -final class get_bigbluebuttons_by_courses_test extends \externallib_advanced_testcase { +final class get_bigbluebuttons_by_courses_test extends \core_external\tests\externallib_testcase { use testcase_helper_trait; /** @@ -177,4 +172,3 @@ final class get_bigbluebuttons_by_courses_test extends \externallib_advanced_tes $this->assertEquals($expectedids, $actualid); } } - diff --git a/public/mod/bigbluebuttonbn/tests/external/get_join_url_test.php b/public/mod/bigbluebuttonbn/tests/external/get_join_url_test.php index 97755c7d642..ff6f489c4d9 100644 --- a/public/mod/bigbluebuttonbn/tests/external/get_join_url_test.php +++ b/public/mod/bigbluebuttonbn/tests/external/get_join_url_test.php @@ -23,11 +23,6 @@ use mod_bigbluebuttonbn\instance; use mod_bigbluebuttonbn\test\testcase_helper_trait; use moodle_exception; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the get_join_url class. * @@ -38,7 +33,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @author Laurent David (laurent@call-learning.fr) * @covers \mod_bigbluebuttonbn\external\get_join_url */ -final class get_join_url_test extends \externallib_advanced_testcase { +final class get_join_url_test extends \core_external\tests\externallib_testcase { use testcase_helper_trait; /** @@ -256,4 +251,3 @@ final class get_join_url_test extends \externallib_advanced_testcase { $this->assertEquals('userlimitreached', $joinurl['warnings'][0]['warningcode']); } } - diff --git a/public/mod/bigbluebuttonbn/tests/external/get_recordings_test.php b/public/mod/bigbluebuttonbn/tests/external/get_recordings_test.php index ab43a12a56e..c073c467709 100644 --- a/public/mod/bigbluebuttonbn/tests/external/get_recordings_test.php +++ b/public/mod/bigbluebuttonbn/tests/external/get_recordings_test.php @@ -21,11 +21,6 @@ use mod_bigbluebuttonbn\instance; use mod_bigbluebuttonbn\test\testcase_helper_trait; use require_login_exception; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the update_course class. * @@ -36,7 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @author Laurent David (laurent@call-learning.fr) * @covers \mod_bigbluebuttonbn\external\get_recordings */ -final class get_recordings_test extends \externallib_advanced_testcase { +final class get_recordings_test extends \core_external\tests\externallib_testcase { use testcase_helper_trait; /** diff --git a/public/mod/bigbluebuttonbn/tests/external/view_bigbluebuttonbn_test.php b/public/mod/bigbluebuttonbn/tests/external/view_bigbluebuttonbn_test.php index 6fde2bd2735..2410a08468e 100644 --- a/public/mod/bigbluebuttonbn/tests/external/view_bigbluebuttonbn_test.php +++ b/public/mod/bigbluebuttonbn/tests/external/view_bigbluebuttonbn_test.php @@ -21,11 +21,6 @@ use mod_bigbluebuttonbn\instance; use mod_bigbluebuttonbn\test\testcase_helper_trait; use require_login_exception; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the view_bigbluebuttonbn class. * @@ -36,7 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @author Laurent David (laurent@call-learning.fr) * @covers \mod_bigbluebuttonbn\external\view_bigbluebuttonbn */ -final class view_bigbluebuttonbn_test extends \externallib_advanced_testcase { +final class view_bigbluebuttonbn_test extends \core_external\tests\externallib_testcase { use testcase_helper_trait; /** @@ -123,4 +118,3 @@ final class view_bigbluebuttonbn_test extends \externallib_advanced_testcase { $this->assertTrue($returnvalue['status']); } } - diff --git a/public/mod/book/tests/externallib_test.php b/public/mod/book/tests/externallib_test.php index e56006c7656..66f6f2c1f1f 100644 --- a/public/mod/book/tests/externallib_test.php +++ b/public/mod/book/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace mod_book; use core_external\external_api; -use externallib_advanced_testcase; use mod_book_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External mod_book functions unit tests * @@ -35,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.0 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test view_book */ diff --git a/public/mod/choice/tests/externallib_test.php b/public/mod/choice/tests/externallib_test.php index 9b48ed38f04..7e189251d60 100644 --- a/public/mod/choice/tests/externallib_test.php +++ b/public/mod/choice/tests/externallib_test.php @@ -17,14 +17,12 @@ namespace mod_choice; use core_external\external_api; -use externallib_advanced_testcase; use mod_choice_external; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/choice/lib.php'); /** @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/mod/choice/lib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \mod_choice_external */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test get_choice_results */ diff --git a/public/mod/choice/tests/lib_test.php b/public/mod/choice/tests/lib_test.php index a3dfe1ff3f3..a129a3d3628 100644 --- a/public/mod/choice/tests/lib_test.php +++ b/public/mod/choice/tests/lib_test.php @@ -29,7 +29,6 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/choice/lib.php'); /** @@ -41,8 +40,7 @@ require_once($CFG->dirroot . '/mod/choice/lib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.0 */ -final class lib_test extends \externallib_advanced_testcase { - +final class lib_test extends \core_external\tests\externallib_testcase { /** * Test choice_view * @return void diff --git a/public/mod/data/tests/external/delete_saved_preset_test.php b/public/mod/data/tests/external/delete_saved_preset_test.php index 3e99f47483d..eea3381ba9b 100644 --- a/public/mod/data/tests/external/delete_saved_preset_test.php +++ b/public/mod/data/tests/external/delete_saved_preset_test.php @@ -16,12 +16,6 @@ namespace mod_data\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -use externallib_advanced_testcase; use core_external\external_api; use mod_data\manager; @@ -35,8 +29,7 @@ use mod_data\manager; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \mod_data\external\delete_saved_preset */ -final class delete_saved_preset_test extends externallib_advanced_testcase { - +final class delete_saved_preset_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of delete_saved_preset(). * diff --git a/public/mod/data/tests/externallib_test.php b/public/mod/data/tests/externallib_test.php index 4fd4cadafc2..81a5d7502c0 100644 --- a/public/mod/data/tests/externallib_test.php +++ b/public/mod/data/tests/externallib_test.php @@ -16,16 +16,9 @@ namespace mod_data; -use externallib_advanced_testcase; -use mod_data_external; use core_external\external_api; use core_external\external_settings; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); +use mod_data_external; /** * Database module external functions tests @@ -37,8 +30,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @since Moodle 2.9 * @coversDefaultClass \mod_data_external */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** @var stdClass Test module context. */ protected $context; diff --git a/public/mod/feedback/tests/external/external_test.php b/public/mod/feedback/tests/external/external_test.php index 6d72b055343..ef0467ff80c 100644 --- a/public/mod/feedback/tests/external/external_test.php +++ b/public/mod/feedback/tests/external/external_test.php @@ -17,7 +17,6 @@ namespace mod_feedback\external; use core_external\external_api; -use externallib_advanced_testcase; use feedback_item_multichoice; use mod_feedback_external; use moodle_exception; @@ -26,7 +25,6 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/feedback/lib.php'); /** @@ -39,8 +37,7 @@ require_once($CFG->dirroot . '/mod/feedback/lib.php'); * @since Moodle 3.3 * @covers \mod_feedback_external */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { // TODO These should be removed. // Testcase classes should not have any properties or store state. protected $course; diff --git a/public/mod/folder/tests/externallib_test.php b/public/mod/folder/tests/externallib_test.php index 0e55bd6be67..16601cc1f3e 100644 --- a/public/mod/folder/tests/externallib_test.php +++ b/public/mod/folder/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace mod_folder; use core_external\external_api; -use externallib_advanced_testcase; use mod_folder_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External mod_folder functions unit tests * @@ -35,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.0 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test view_folder */ diff --git a/public/mod/forum/tests/external/set_forum_subscription_test.php b/public/mod/forum/tests/external/set_forum_subscription_test.php index f30cd1815e3..c7ba78d6292 100644 --- a/public/mod/forum/tests/external/set_forum_subscription_test.php +++ b/public/mod/forum/tests/external/set_forum_subscription_test.php @@ -19,7 +19,7 @@ namespace mod_forum\external; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); + require_once($CFG->dirroot . '/mod/forum/lib.php'); use core_external\external_api; @@ -35,8 +35,7 @@ use mod_forum\subscriptions; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \mod_forum\external\set_forum_subscription */ -final class set_forum_subscription_test extends \externallib_advanced_testcase { - +final class set_forum_subscription_test extends \core_external\tests\externallib_testcase { #[\Override] public function setUp(): void { parent::setUp(); diff --git a/public/mod/forum/tests/external/set_forum_tracking_test.php b/public/mod/forum/tests/external/set_forum_tracking_test.php index f4665a177cd..da5a685776c 100644 --- a/public/mod/forum/tests/external/set_forum_tracking_test.php +++ b/public/mod/forum/tests/external/set_forum_tracking_test.php @@ -19,7 +19,6 @@ namespace mod_forum\external; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/forum/lib.php'); use core_external\external_api; @@ -35,8 +34,7 @@ use mod_forum\subscriptions; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \mod_forum\external\set_forum_tracking */ -final class set_forum_tracking_test extends \externallib_advanced_testcase { - +final class set_forum_tracking_test extends \core_external\tests\externallib_testcase { #[\Override] public function setUp(): void { parent::setUp(); diff --git a/public/mod/forum/tests/externallib_test.php b/public/mod/forum/tests/externallib_test.php index 1a4b69c1a22..19962aade9a 100644 --- a/public/mod/forum/tests/externallib_test.php +++ b/public/mod/forum/tests/externallib_test.php @@ -17,16 +17,8 @@ namespace mod_forum; use core_external\external_api; -use externallib_advanced_testcase; use mod_forum_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); -require_once($CFG->dirroot . '/mod/forum/lib.php'); - /** * The module forums external functions unit tests * @@ -35,8 +27,7 @@ require_once($CFG->dirroot . '/mod/forum/lib.php'); * @copyright 2012 Mark Nelson * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Tests set up */ diff --git a/public/mod/glossary/tests/external/delete_entry_test.php b/public/mod/glossary/tests/external/delete_entry_test.php index 17fcae418af..407536bd7c2 100644 --- a/public/mod/glossary/tests/external/delete_entry_test.php +++ b/public/mod/glossary/tests/external/delete_entry_test.php @@ -16,13 +16,7 @@ namespace mod_glossary\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - use core_external\external_api; -use externallib_advanced_testcase; /** * External function test for delete_entry. @@ -34,8 +28,7 @@ use externallib_advanced_testcase; * @copyright 2020 Juan Leyva * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_entry_test extends externallib_advanced_testcase { - +final class delete_entry_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of delete_entry(). */ diff --git a/public/mod/glossary/tests/external/external_test.php b/public/mod/glossary/tests/external/external_test.php index 967d898fdfe..36db1e17346 100644 --- a/public/mod/glossary/tests/external/external_test.php +++ b/public/mod/glossary/tests/external/external_test.php @@ -14,26 +14,12 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External glossary functions unit tests - * - * @package mod_glossary - * @category external - * @copyright 2015 Costantino Cito - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - namespace mod_glossary\external; use core_external\external_api; use core_external\util as external_util; -use externallib_advanced_testcase; use mod_glossary_external; -defined('MOODLE_INTERNAL') || die(); -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External glossary functions unit tests * @@ -42,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2015 Costantino Cito * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { /** * Test get_glossaries_by_courses */ diff --git a/public/mod/glossary/tests/external/prepare_entry_test.php b/public/mod/glossary/tests/external/prepare_entry_test.php index 9bd98b1f248..e2cefb73b08 100644 --- a/public/mod/glossary/tests/external/prepare_entry_test.php +++ b/public/mod/glossary/tests/external/prepare_entry_test.php @@ -16,13 +16,7 @@ namespace mod_glossary\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - use core_external\external_api; -use externallib_advanced_testcase; /** * External function test for prepare_entry. @@ -34,8 +28,7 @@ use externallib_advanced_testcase; * @copyright 2020 Juan Leyva * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class prepare_entry_test extends externallib_advanced_testcase { - +final class prepare_entry_test extends \core_external\tests\externallib_testcase { /** * test_prepare_entry */ diff --git a/public/mod/glossary/tests/external/update_entry_test.php b/public/mod/glossary/tests/external/update_entry_test.php index de39c5edcd3..205597888fb 100644 --- a/public/mod/glossary/tests/external/update_entry_test.php +++ b/public/mod/glossary/tests/external/update_entry_test.php @@ -16,17 +16,11 @@ namespace mod_glossary\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -use core_external\external_api; -use externallib_advanced_testcase; -use mod_glossary_external; use context_module; use context_user; +use core_external\external_api; use core_external\util as external_util; +use mod_glossary_external; /** * External function test for update_entry. @@ -38,8 +32,7 @@ use core_external\util as external_util; * @copyright 2020 Juan Leyva * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class update_entry_test extends externallib_advanced_testcase { - +final class update_entry_test extends \core_external\tests\externallib_testcase { /** * test_update_entry_without_optional_settings */ diff --git a/public/mod/h5pactivity/tests/external/get_attempts_test.php b/public/mod/h5pactivity/tests/external/get_attempts_test.php index d9f22b44232..18d472ced0c 100644 --- a/public/mod/h5pactivity/tests/external/get_attempts_test.php +++ b/public/mod/h5pactivity/tests/external/get_attempts_test.php @@ -14,26 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External function test for get_attempts. - * - * @package mod_h5pactivity - * @category external - * @since Moodle 3.9 - * @copyright 2020 Ferran Recio - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - namespace mod_h5pactivity\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -use mod_h5pactivity\local\manager; use core_external\external_api; -use externallib_advanced_testcase; +use mod_h5pactivity\local\manager; /** * External function test for get_attempts. @@ -42,8 +26,7 @@ use externallib_advanced_testcase; * @copyright 2020 Ferran Recio * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_attempts_test extends externallib_advanced_testcase { - +final class get_attempts_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of get_attempts. * diff --git a/public/mod/h5pactivity/tests/external/get_h5pactivities_by_courses_test.php b/public/mod/h5pactivity/tests/external/get_h5pactivities_by_courses_test.php index 9d411fea7e5..06049652bdd 100644 --- a/public/mod/h5pactivity/tests/external/get_h5pactivities_by_courses_test.php +++ b/public/mod/h5pactivity/tests/external/get_h5pactivities_by_courses_test.php @@ -14,26 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External function test for get_h5pactivities_by_courses. - * - * @package mod_h5pactivity - * @category external - * @since Moodle 3.9 - * @copyright 2020 Carlos Escobedo - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - namespace mod_h5pactivity\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - use core_external\external_api; -use externallib_advanced_testcase; use context_module; /** @@ -43,8 +26,7 @@ use context_module; * @copyright 2020 Carlos Escobedo * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_h5pactivities_by_courses_test extends externallib_advanced_testcase { - +final class get_h5pactivities_by_courses_test extends \core_external\tests\externallib_testcase { /** * Test test_get_h5pactivities_by_courses user student. */ diff --git a/public/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php b/public/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php index 519fd47946b..49f3a6dd9e2 100644 --- a/public/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php +++ b/public/mod/h5pactivity/tests/external/get_h5pactivity_access_information_test.php @@ -14,26 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External function test for get_h5pactivity_access_information. - * - * @package mod_h5pactivity - * @category external - * @since Moodle 3.9 - * @copyright 2020 Carlos Escobedo - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - namespace mod_h5pactivity\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -use dml_missing_record_exception; use core_external\external_api; -use externallib_advanced_testcase; +use dml_missing_record_exception; /** * External function test for get_h5pactivity_access_information. @@ -42,8 +26,7 @@ use externallib_advanced_testcase; * @copyright 2020 Carlos Escobedo * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_h5pactivity_access_information_test extends externallib_advanced_testcase { - +final class get_h5pactivity_access_information_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of get_h5pactivity_access_information(). * @@ -134,4 +117,4 @@ final class get_h5pactivity_access_information_test extends externallib_advanced $this->expectException(dml_missing_record_exception::class); $result = get_h5pactivity_access_information::execute(1); } -} \ No newline at end of file +} diff --git a/public/mod/h5pactivity/tests/external/get_results_test.php b/public/mod/h5pactivity/tests/external/get_results_test.php index a3ab69ef2e1..fea38595a0c 100644 --- a/public/mod/h5pactivity/tests/external/get_results_test.php +++ b/public/mod/h5pactivity/tests/external/get_results_test.php @@ -14,27 +14,11 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . -/** - * External function test for get_results. - * - * @package mod_h5pactivity - * @category external - * @since Moodle 3.9 - * @copyright 2020 Ferran Recio - * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - */ - namespace mod_h5pactivity\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -use mod_h5pactivity\local\manager; use core_external\external_api; -use externallib_advanced_testcase; use dml_missing_record_exception; +use mod_h5pactivity\local\manager; /** * External function test for get_results. @@ -43,8 +27,7 @@ use dml_missing_record_exception; * @copyright 2020 Ferran Recio * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_results_test extends externallib_advanced_testcase { - +final class get_results_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of get_results. * diff --git a/public/mod/h5pactivity/tests/external/get_user_attempts_test.php b/public/mod/h5pactivity/tests/external/get_user_attempts_test.php index 8088fd25c6f..505e7edf3a7 100644 --- a/public/mod/h5pactivity/tests/external/get_user_attempts_test.php +++ b/public/mod/h5pactivity/tests/external/get_user_attempts_test.php @@ -26,14 +26,8 @@ namespace mod_h5pactivity\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -use mod_h5pactivity\local\manager; use core_external\external_api; -use externallib_advanced_testcase; +use mod_h5pactivity\local\manager; /** * External function test for get_user_attempts. @@ -42,8 +36,7 @@ use externallib_advanced_testcase; * @copyright 2020 Ilya Tregubov * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_user_attempts_test extends externallib_advanced_testcase { - +final class get_user_attempts_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of get_user_attempts getting more than one user at once. * diff --git a/public/mod/h5pactivity/tests/external/log_report_viewed_test.php b/public/mod/h5pactivity/tests/external/log_report_viewed_test.php index 6220ce62214..184b5d14df8 100644 --- a/public/mod/h5pactivity/tests/external/log_report_viewed_test.php +++ b/public/mod/h5pactivity/tests/external/log_report_viewed_test.php @@ -16,14 +16,8 @@ namespace mod_h5pactivity\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -use mod_h5pactivity\local\manager; use core_external\external_api; -use externallib_advanced_testcase; +use mod_h5pactivity\local\manager; /** * External function test for log_report_viewed. @@ -35,8 +29,7 @@ use externallib_advanced_testcase; * @copyright 2021 Ilya Tregubov * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class log_report_viewed_test extends externallib_advanced_testcase { - +final class log_report_viewed_test extends \core_external\tests\externallib_testcase { /** * Test the behaviour of log_report_viewed. * diff --git a/public/mod/h5pactivity/tests/external/view_h5pactivity_test.php b/public/mod/h5pactivity/tests/external/view_h5pactivity_test.php index 1272c005607..18ff0292e83 100644 --- a/public/mod/h5pactivity/tests/external/view_h5pactivity_test.php +++ b/public/mod/h5pactivity/tests/external/view_h5pactivity_test.php @@ -26,17 +26,10 @@ namespace mod_h5pactivity\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -use core_external\external_api; -use externallib_advanced_testcase; -use stdClass; use context_module; +use core_external\external_api; use course_modinfo; +use stdClass; /** * External function test for view_h5pactivity. @@ -45,8 +38,7 @@ use course_modinfo; * @copyright 2020 Carlos Escobedo * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class view_h5pactivity_test extends externallib_advanced_testcase { - +final class view_h5pactivity_test extends \core_external\tests\externallib_testcase { /** * Test test_view_h5pactivity invalid id. */ diff --git a/public/mod/imscp/tests/externallib_test.php b/public/mod/imscp/tests/externallib_test.php index 9d684eced7c..ddbfbc1535c 100644 --- a/public/mod/imscp/tests/externallib_test.php +++ b/public/mod/imscp/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace mod_imscp; use core_external\external_api; -use externallib_advanced_testcase; use mod_imscp_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External mod_imscp functions unit tests * @@ -35,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.0 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test view_imscp */ diff --git a/public/mod/label/tests/externallib_test.php b/public/mod/label/tests/externallib_test.php index 77ca144bb2b..95a515180e0 100644 --- a/public/mod/label/tests/externallib_test.php +++ b/public/mod/label/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace mod_label; use core_external\external_api; -use externallib_advanced_testcase; use mod_label_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External mod_label functions unit tests * @@ -35,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.3 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test test_mod_label_get_labels_by_courses */ diff --git a/public/mod/lesson/tests/external/external_test.php b/public/mod/lesson/tests/external/external_test.php index 5a84247aa90..e84bb73e5ab 100644 --- a/public/mod/lesson/tests/external/external_test.php +++ b/public/mod/lesson/tests/external/external_test.php @@ -26,17 +26,15 @@ namespace mod_lesson\external; -use externallib_advanced_testcase; -use mod_lesson_external; -use lesson; use core_external\external_api; use core_external\external_settings; +use lesson; +use mod_lesson_external; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/lesson/locallib.php'); /** @@ -72,8 +70,7 @@ class testable_mod_lesson_external extends mod_lesson_external { * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.3 */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { /** @var \stdClass course record. */ protected \stdClass $course; diff --git a/public/mod/lti/tests/mod_lti_testcase.php b/public/mod/lti/tests/mod_lti_testcase.php index 9fe7b76d441..da25d3016d1 100644 --- a/public/mod/lti/tests/mod_lti_testcase.php +++ b/public/mod/lti/tests/mod_lti_testcase.php @@ -20,7 +20,6 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/lti/locallib.php'); /** @@ -31,8 +30,7 @@ require_once($CFG->dirroot . '/mod/lti/locallib.php'); * @copyright 2020 Catalyst IT * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -abstract class mod_lti_testcase extends externallib_advanced_testcase { - +abstract class mod_lti_testcase extends \core_external\tests\externallib_testcase { /** * Generate a tool type. * diff --git a/public/mod/page/tests/externallib_test.php b/public/mod/page/tests/externallib_test.php index d04e2e62746..abf79d4100a 100644 --- a/public/mod/page/tests/externallib_test.php +++ b/public/mod/page/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace mod_page; use core_external\external_api; -use externallib_advanced_testcase; use mod_page_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External mod_page functions unit tests * @@ -35,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.0 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test view_page */ diff --git a/public/mod/quiz/tests/external/external_test.php b/public/mod/quiz/tests/external/external_test.php index 151f8f11ecd..16e53a1e6ea 100644 --- a/public/mod/quiz/tests/external/external_test.php +++ b/public/mod/quiz/tests/external/external_test.php @@ -28,7 +28,6 @@ namespace mod_quiz\external; use core_external\external_api; use core_question\local\bank\question_version_status; -use externallib_advanced_testcase; use mod_quiz\question\display_options; use mod_quiz\quiz_attempt; use mod_quiz\quiz_settings; @@ -40,7 +39,6 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/quiz/tests/quiz_question_helper_test_trait.php'); /** @@ -86,8 +84,7 @@ class testable_mod_quiz_external extends mod_quiz_external { * @since Moodle 3.1 * @covers \mod_quiz_external */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { use \quiz_question_helper_test_trait; /** @var \stdClass course record. */ diff --git a/public/mod/quiz/tests/external/grade_items_test.php b/public/mod/quiz/tests/external/grade_items_test.php index 60d704f7096..044277351f4 100644 --- a/public/mod/quiz/tests/external/grade_items_test.php +++ b/public/mod/quiz/tests/external/grade_items_test.php @@ -16,17 +16,10 @@ namespace mod_quiz\external; -defined('MOODLE_INTERNAL') || die(); - -require_once(__DIR__ . '/../../../../webservice/tests/helpers.php'); - use coding_exception; use core_question_generator; -use externallib_advanced_testcase; -use mod_quiz\quiz_attempt; use mod_quiz\quiz_settings; use required_capability_exception; -use stdClass; /** * Test for the grade_items CRUD service. @@ -40,8 +33,7 @@ use stdClass; * @covers \mod_quiz\external\update_grade_items * @covers \mod_quiz\structure */ -final class grade_items_test extends externallib_advanced_testcase { - +final class grade_items_test extends \core_external\tests\externallib_testcase { public function test_create_grade_items_service_works(): void { $quizobj = $this->create_quiz_with_two_grade_items(); diff --git a/public/mod/quiz/tests/external/override_test.php b/public/mod/quiz/tests/external/override_test.php index 4cd6b332945..7b87796b73e 100644 --- a/public/mod/quiz/tests/external/override_test.php +++ b/public/mod/quiz/tests/external/override_test.php @@ -16,10 +16,6 @@ namespace mod_quiz\external; -defined('MOODLE_INTERNAL') || die(); - -require_once(__DIR__ . '/../../../../webservice/tests/helpers.php'); - /** * Tests for override webservices * @@ -30,7 +26,7 @@ require_once(__DIR__ . '/../../../../webservice/tests/helpers.php'); * @covers \mod_quiz\external\save_overrides * @covers \mod_quiz\external\delete_overrides */ -final class override_test extends \externallib_advanced_testcase { +final class override_test extends \core_external\tests\externallib_testcase { /** * Creates a quiz for testing. * diff --git a/public/mod/quiz/tests/external/reopen_attempt_test.php b/public/mod/quiz/tests/external/reopen_attempt_test.php index 4fbc613b17a..95fb6b9554e 100644 --- a/public/mod/quiz/tests/external/reopen_attempt_test.php +++ b/public/mod/quiz/tests/external/reopen_attempt_test.php @@ -16,10 +16,6 @@ namespace mod_quiz\external; -defined('MOODLE_INTERNAL') || die(); - -require_once(__DIR__ . '/../../../../webservice/tests/helpers.php'); - use coding_exception; use core_question_generator; use externallib_advanced_testcase; @@ -38,7 +34,7 @@ use stdClass; * @covers \mod_quiz\external\reopen_attempt * @covers \mod_quiz\external\get_reopen_attempt_confirmation */ -final class reopen_attempt_test extends externallib_advanced_testcase { +final class reopen_attempt_test extends \core_external\tests\externallib_testcase { /** @var stdClass|null if we make a quiz attempt, we store the student object here. */ protected $student; diff --git a/public/mod/quiz/tests/external/update_slots_test.php b/public/mod/quiz/tests/external/update_slots_test.php index ad972349cf0..e8bfa5f00a9 100644 --- a/public/mod/quiz/tests/external/update_slots_test.php +++ b/public/mod/quiz/tests/external/update_slots_test.php @@ -16,12 +16,7 @@ namespace mod_quiz\external; -defined('MOODLE_INTERNAL') || die(); - -require_once(__DIR__ . '/../../../../webservice/tests/helpers.php'); - use core_question_generator; -use externallib_advanced_testcase; use mod_quiz\quiz_settings; use required_capability_exception; @@ -34,8 +29,7 @@ use required_capability_exception; * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \mod_quiz\external\update_slots */ -final class update_slots_test extends externallib_advanced_testcase { - +final class update_slots_test extends \core_external\tests\externallib_testcase { public function test_update_slots_service_works(): void { global $DB; diff --git a/public/mod/resource/tests/externallib_test.php b/public/mod/resource/tests/externallib_test.php index f731b24800a..2502f18587f 100644 --- a/public/mod/resource/tests/externallib_test.php +++ b/public/mod/resource/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace mod_resource; use core_external\external_api; -use externallib_advanced_testcase; use mod_resource_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External mod_resource functions unit tests * @@ -35,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.0 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test view_resource */ diff --git a/public/mod/scorm/tests/externallib_test.php b/public/mod/scorm/tests/externallib_test.php index 851009641df..14ba546baea 100644 --- a/public/mod/scorm/tests/externallib_test.php +++ b/public/mod/scorm/tests/externallib_test.php @@ -17,14 +17,12 @@ namespace mod_scorm; use core_external\external_api; -use externallib_advanced_testcase; use mod_scorm_external; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/scorm/lib.php'); /** @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/mod/scorm/lib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.0 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** @var \stdClass course record. */ protected \stdClass $course; diff --git a/public/mod/url/tests/externallib_test.php b/public/mod/url/tests/externallib_test.php index 8d5a4241770..71b6fb5600d 100644 --- a/public/mod/url/tests/externallib_test.php +++ b/public/mod/url/tests/externallib_test.php @@ -17,15 +17,8 @@ namespace mod_url; use core_external\external_api; -use externallib_advanced_testcase; use mod_url_external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * External mod_url functions unit tests * @@ -35,8 +28,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.0 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test view_url */ diff --git a/public/mod/wiki/tests/externallib_test.php b/public/mod/wiki/tests/externallib_test.php index ddb745613a6..54aefaca88b 100644 --- a/public/mod/wiki/tests/externallib_test.php +++ b/public/mod/wiki/tests/externallib_test.php @@ -17,14 +17,12 @@ namespace mod_wiki; use core_external\external_api; -use externallib_advanced_testcase; use mod_wiki_external; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/wiki/lib.php'); /** @@ -36,8 +34,7 @@ require_once($CFG->dirroot . '/mod/wiki/lib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.1 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** @var \stdClass course record. */ protected $course; diff --git a/public/mod/workshop/tests/external/external_test.php b/public/mod/workshop/tests/external/external_test.php index 8a7eb7ac77c..8079cd40cd8 100644 --- a/public/mod/workshop/tests/external/external_test.php +++ b/public/mod/workshop/tests/external/external_test.php @@ -27,7 +27,6 @@ namespace mod_workshop\external; use core_external\external_api; -use externallib_advanced_testcase; use mod_workshop_external; use workshop; @@ -35,7 +34,6 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/mod/workshop/lib.php'); /** @@ -47,8 +45,7 @@ require_once($CFG->dirroot . '/mod/workshop/lib.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.4 */ -final class external_test extends externallib_advanced_testcase { - +final class external_test extends \core_external\tests\externallib_testcase { /** @var stdClass course object */ private $course; /** @var stdClass workshop object */ diff --git a/public/my/tests/external/view_page_test.php b/public/my/tests/external/view_page_test.php index 16ea9185fd0..a8074712666 100644 --- a/public/my/tests/external/view_page_test.php +++ b/public/my/tests/external/view_page_test.php @@ -16,14 +16,6 @@ namespace core_my\external; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Test Class for external function core_my_view_page. * @@ -34,8 +26,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @since Moodle 4.3 * @covers \core_my\external\view_page */ -final class view_page_test extends externallib_advanced_testcase { - +final class view_page_test extends \core_external\tests\externallib_testcase { /** * Set up for every test. */ diff --git a/public/notes/tests/externallib_test.php b/public/notes/tests/externallib_test.php index 6a08874b9d2..668056e6275 100644 --- a/public/notes/tests/externallib_test.php +++ b/public/notes/tests/externallib_test.php @@ -14,6 +14,11 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +namespace core_notes; + +use core_external\external_api; +use core_notes_external; + /** * External notes functions unit tests * @@ -22,21 +27,14 @@ * @copyright 2012 Jerome Mouneyrac * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +final class externallib_test extends \core_external\tests\externallib_testcase { + #[\Override] + public static function setUpBeforeClass(): void { + global $CFG; -namespace core_notes; - -use core_external\external_api; -use core_notes_external; -use externallib_advanced_testcase; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); -require_once($CFG->dirroot . '/notes/externallib.php'); - -final class externallib_test extends externallib_advanced_testcase { + parent::setUpBeforeClass(); + require_once($CFG->dirroot . '/notes/externallib.php'); + } /** * Test create_notes diff --git a/public/question/bank/tagquestion/tests/external/submit_tags_test.php b/public/question/bank/tagquestion/tests/external/submit_tags_test.php index ff91ef5905e..6c4c5cba378 100644 --- a/public/question/bank/tagquestion/tests/external/submit_tags_test.php +++ b/public/question/bank/tagquestion/tests/external/submit_tags_test.php @@ -16,11 +16,6 @@ namespace qbank_tagquestion\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Question external functions tests. * @@ -29,8 +24,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @author 2021 Safat Shahin * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class submit_tags_test extends \externallib_advanced_testcase { - +final class submit_tags_test extends \core_external\tests\externallib_testcase { /** @var \stdClass course record. */ protected $course; diff --git a/public/question/tests/externallib_test.php b/public/question/tests/externallib_test.php index ae355a51aa9..63da952f634 100644 --- a/public/question/tests/externallib_test.php +++ b/public/question/tests/externallib_test.php @@ -18,13 +18,11 @@ namespace core_question; use core_external\restricted_context_exception; use core_question_external; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/question/engine/tests/helpers.php'); /** @@ -37,8 +35,7 @@ require_once($CFG->dirroot . '/question/engine/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @since Moodle 3.1 */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** @var \stdClass course record. */ protected $course; diff --git a/public/rating/tests/externallib_test.php b/public/rating/tests/externallib_test.php index 7730d2b84bb..52f2c43d414 100644 --- a/public/rating/tests/externallib_test.php +++ b/public/rating/tests/externallib_test.php @@ -27,13 +27,11 @@ namespace core_rating; use core_external\external_api; use core_rating_external; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/rating/lib.php'); /** @@ -44,8 +42,7 @@ require_once($CFG->dirroot . '/rating/lib.php'); * @copyright 2015 Costantino Cito * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** @var \stdClass course record. */ protected $course; diff --git a/public/reportbuilder/tests/external/audiences/delete_test.php b/public/reportbuilder/tests/external/audiences/delete_test.php index acf346e5b0e..93dff22700b 100644 --- a/public/reportbuilder/tests/external/audiences/delete_test.php +++ b/public/reportbuilder/tests/external/audiences/delete_test.php @@ -18,19 +18,12 @@ declare(strict_types=1); namespace core_reportbuilder\external\audiences; -use context_system; use core_reportbuilder\local\models\audience; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for deleting report audiences * @@ -39,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 David Matamoros * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_test extends externallib_advanced_testcase { - +final class delete_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/columns/add_test.php b/public/reportbuilder/tests/external/columns/add_test.php index 1fd7fcb6e67..aa4c9f05461 100644 --- a/public/reportbuilder/tests/external/columns/add_test.php +++ b/public/reportbuilder/tests/external/columns/add_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\columns; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for adding report columns * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class add_test extends externallib_advanced_testcase { - +final class add_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/columns/delete_test.php b/public/reportbuilder/tests/external/columns/delete_test.php index d77d888b579..a86465e09c9 100644 --- a/public/reportbuilder/tests/external/columns/delete_test.php +++ b/public/reportbuilder/tests/external/columns/delete_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\columns; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for deleting report columns * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_test extends externallib_advanced_testcase { - +final class delete_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/columns/reorder_test.php b/public/reportbuilder/tests/external/columns/reorder_test.php index b94cddea886..79899cf8780 100644 --- a/public/reportbuilder/tests/external/columns/reorder_test.php +++ b/public/reportbuilder/tests/external/columns/reorder_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\columns; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for re-ordering report columns * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class reorder_test extends externallib_advanced_testcase { - +final class reorder_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/columns/sort/get_test.php b/public/reportbuilder/tests/external/columns/sort/get_test.php index 1d412b25f0f..e5c5beb2e13 100644 --- a/public/reportbuilder/tests/external/columns/sort/get_test.php +++ b/public/reportbuilder/tests/external/columns/sort/get_test.php @@ -20,15 +20,9 @@ namespace core_reportbuilder\external\columns\sort; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for retrieving report column sorting * @@ -37,8 +31,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_test extends externallib_advanced_testcase { - +final class get_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/columns/sort/reorder_test.php b/public/reportbuilder/tests/external/columns/sort/reorder_test.php index 3b224d8930b..eff623437bb 100644 --- a/public/reportbuilder/tests/external/columns/sort/reorder_test.php +++ b/public/reportbuilder/tests/external/columns/sort/reorder_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\columns\sort; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for re-ordering report column sorting * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class reorder_test extends externallib_advanced_testcase { - +final class reorder_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/columns/sort/toggle_test.php b/public/reportbuilder/tests/external/columns/sort/toggle_test.php index 48bb3b9d22b..96a248b36ab 100644 --- a/public/reportbuilder/tests/external/columns/sort/toggle_test.php +++ b/public/reportbuilder/tests/external/columns/sort/toggle_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\columns\sort; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\column; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for toggling report column sorting * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class toggle_test extends externallib_advanced_testcase { - +final class toggle_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/conditions/add_test.php b/public/reportbuilder/tests/external/conditions/add_test.php index 326b52b172b..cf4c0df0390 100644 --- a/public/reportbuilder/tests/external/conditions/add_test.php +++ b/public/reportbuilder/tests/external/conditions/add_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\conditions; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for adding report conditions * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class add_test extends externallib_advanced_testcase { - +final class add_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/conditions/delete_test.php b/public/reportbuilder/tests/external/conditions/delete_test.php index 615e8ba345e..27ae3363643 100644 --- a/public/reportbuilder/tests/external/conditions/delete_test.php +++ b/public/reportbuilder/tests/external/conditions/delete_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\conditions; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for deleting report conditions * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_test extends externallib_advanced_testcase { - +final class delete_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/conditions/reorder_test.php b/public/reportbuilder/tests/external/conditions/reorder_test.php index 072d790b321..f3548f5ae78 100644 --- a/public/reportbuilder/tests/external/conditions/reorder_test.php +++ b/public/reportbuilder/tests/external/conditions/reorder_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\conditions; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for re-ordering report conditions * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class reorder_test extends externallib_advanced_testcase { - +final class reorder_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/conditions/reset_test.php b/public/reportbuilder/tests/external/conditions/reset_test.php index 4dfd360539a..995eeffe021 100644 --- a/public/reportbuilder/tests/external/conditions/reset_test.php +++ b/public/reportbuilder/tests/external/conditions/reset_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\conditions; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\manager; use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for resetting report conditions * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class reset_test extends externallib_advanced_testcase { - +final class reset_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/filters/add_test.php b/public/reportbuilder/tests/external/filters/add_test.php index 4e85c615a5c..b32ead976ea 100644 --- a/public/reportbuilder/tests/external/filters/add_test.php +++ b/public/reportbuilder/tests/external/filters/add_test.php @@ -18,19 +18,12 @@ declare(strict_types=1); namespace core_reportbuilder\external\filters; -use core_reportbuilder\manager; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for adding report filters * @@ -39,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class add_test extends externallib_advanced_testcase { - +final class add_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/filters/delete_test.php b/public/reportbuilder/tests/external/filters/delete_test.php index 8f50c830b01..615a0d560dd 100644 --- a/public/reportbuilder/tests/external/filters/delete_test.php +++ b/public/reportbuilder/tests/external/filters/delete_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\filters; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for deleting report filters * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_test extends externallib_advanced_testcase { - +final class delete_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/filters/reorder_test.php b/public/reportbuilder/tests/external/filters/reorder_test.php index 858ef9363c8..e2e7fca733b 100644 --- a/public/reportbuilder/tests/external/filters/reorder_test.php +++ b/public/reportbuilder/tests/external/filters/reorder_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\filters; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\filter; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for re-ordering report filters * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class reorder_test extends externallib_advanced_testcase { - +final class reorder_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/filters/reset_test.php b/public/reportbuilder/tests/external/filters/reset_test.php index f487993250e..ed204d117ca 100644 --- a/public/reportbuilder/tests/external/filters/reset_test.php +++ b/public/reportbuilder/tests/external/filters/reset_test.php @@ -22,14 +22,8 @@ use core_reportbuilder_generator; use core_reportbuilder\manager; use core_reportbuilder\exception\report_access_exception; use core_external\external_api; -use externallib_advanced_testcase; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests external filters reset class * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class reset_test extends externallib_advanced_testcase { - +final class reset_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/filters/set_test.php b/public/reportbuilder/tests/external/filters/set_test.php index 63e4eb70cab..9be1ba70f2c 100644 --- a/public/reportbuilder/tests/external/filters/set_test.php +++ b/public/reportbuilder/tests/external/filters/set_test.php @@ -22,14 +22,8 @@ use core_reportbuilder_generator; use core_reportbuilder\manager; use core_reportbuilder\exception\report_access_exception; use core_external\external_api; -use externallib_advanced_testcase; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests external filters set class * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2022 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class set_test extends externallib_advanced_testcase { - +final class set_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/reports/delete_test.php b/public/reportbuilder/tests/external/reports/delete_test.php index 6ae208fd495..e55cafe93e5 100644 --- a/public/reportbuilder/tests/external/reports/delete_test.php +++ b/public/reportbuilder/tests/external/reports/delete_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\reports; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\report; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for deleting reports * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_test extends externallib_advanced_testcase { - +final class delete_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/reports/get_test.php b/public/reportbuilder/tests/external/reports/get_test.php index 2c93028e98d..3805119d0ea 100644 --- a/public/reportbuilder/tests/external/reports/get_test.php +++ b/public/reportbuilder/tests/external/reports/get_test.php @@ -22,17 +22,11 @@ use context_system; use core\output\pix_icon; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\manager; use core_reportbuilder\output\report_action; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for getting reports * @@ -41,8 +35,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 David Matamoros * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class get_test extends externallib_advanced_testcase { - +final class get_test extends \core_external\tests\externallib_testcase { /** * Text execute method for edit mode */ diff --git a/public/reportbuilder/tests/external/reports/listing_test.php b/public/reportbuilder/tests/external/reports/listing_test.php index 57119fd188d..7303687221b 100644 --- a/public/reportbuilder/tests/external/reports/listing_test.php +++ b/public/reportbuilder/tests/external/reports/listing_test.php @@ -22,15 +22,9 @@ use context_system; use core_customfield_generator; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for listing reports * @@ -39,8 +33,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2022 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class listing_test extends externallib_advanced_testcase { - +final class listing_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/reports/retrieve_test.php b/public/reportbuilder/tests/external/reports/retrieve_test.php index 1fdc563c88f..2fe29f3f3f0 100644 --- a/public/reportbuilder/tests/external/reports/retrieve_test.php +++ b/public/reportbuilder/tests/external/reports/retrieve_test.php @@ -21,15 +21,9 @@ namespace core_reportbuilder\external\reports; use core_customfield_generator; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for retrieving custom report content * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2022 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class retrieve_test extends externallib_advanced_testcase { - +final class retrieve_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/reports/view_test.php b/public/reportbuilder/tests/external/reports/view_test.php index b1c207f39b9..e8acb1b72f7 100644 --- a/public/reportbuilder/tests/external/reports/view_test.php +++ b/public/reportbuilder/tests/external/reports/view_test.php @@ -20,17 +20,11 @@ namespace core_reportbuilder\external\reports; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\event\report_viewed; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\models\report; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for viewing reports * @@ -39,8 +33,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2022 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class view_test extends externallib_advanced_testcase { - +final class view_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/schedules/delete_test.php b/public/reportbuilder/tests/external/schedules/delete_test.php index d0224d2e64f..e062bbb9772 100644 --- a/public/reportbuilder/tests/external/schedules/delete_test.php +++ b/public/reportbuilder/tests/external/schedules/delete_test.php @@ -20,15 +20,9 @@ namespace core_reportbuilder\external\schedules; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for deleting report schedules * @@ -37,8 +31,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class delete_test extends externallib_advanced_testcase { - +final class delete_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/schedules/send_test.php b/public/reportbuilder/tests/external/schedules/send_test.php index bb0b49e1a3c..d21af2ff00a 100644 --- a/public/reportbuilder/tests/external/schedules/send_test.php +++ b/public/reportbuilder/tests/external/schedules/send_test.php @@ -20,16 +20,10 @@ namespace core_reportbuilder\external\schedules; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\task\send_schedule; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for sending report schedules * @@ -38,8 +32,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class send_test extends externallib_advanced_testcase { - +final class send_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/schedules/toggle_test.php b/public/reportbuilder/tests/external/schedules/toggle_test.php index 291f4ccfc9a..18f502ed491 100644 --- a/public/reportbuilder/tests/external/schedules/toggle_test.php +++ b/public/reportbuilder/tests/external/schedules/toggle_test.php @@ -20,15 +20,9 @@ namespace core_reportbuilder\external\schedules; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for toggling report schedules * @@ -37,8 +31,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2021 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class toggle_test extends externallib_advanced_testcase { - +final class toggle_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/systemreports/can_view_test.php b/public/reportbuilder/tests/external/systemreports/can_view_test.php index b492eee9a68..950afe7d9d9 100644 --- a/public/reportbuilder/tests/external/systemreports/can_view_test.php +++ b/public/reportbuilder/tests/external/systemreports/can_view_test.php @@ -20,14 +20,8 @@ namespace core_reportbuilder\external\systemreports; use core\context\system; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\local\systemreports\reports_list; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for validating access to a system report * @@ -36,8 +30,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2023 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class can_view_test extends externallib_advanced_testcase { - +final class can_view_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/reportbuilder/tests/external/systemreports/retrieve_test.php b/public/reportbuilder/tests/external/systemreports/retrieve_test.php index 7bfb626761e..c827c3720e1 100644 --- a/public/reportbuilder/tests/external/systemreports/retrieve_test.php +++ b/public/reportbuilder/tests/external/systemreports/retrieve_test.php @@ -21,16 +21,10 @@ namespace core_reportbuilder\external\systemreports; use core\context\system; use core_reportbuilder_generator; use core_external\external_api; -use externallib_advanced_testcase; use core_reportbuilder\exception\report_access_exception; use core_reportbuilder\local\systemreports\reports_list; use core_user\reportbuilder\datasource\users; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); - /** * Unit tests of external class for retrieving system report content * @@ -39,8 +33,7 @@ require_once("{$CFG->dirroot}/webservice/tests/helpers.php"); * @copyright 2023 Paul Holden * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class retrieve_test extends externallib_advanced_testcase { - +final class retrieve_test extends \core_external\tests\externallib_testcase { /** * Text execute method */ diff --git a/public/search/tests/external/get_results_test.php b/public/search/tests/external/get_results_test.php index d3e2c046481..e34e7820278 100644 --- a/public/search/tests/external/get_results_test.php +++ b/public/search/tests/external/get_results_test.php @@ -18,11 +18,6 @@ namespace core_search\external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the get_results external function. * @@ -32,8 +27,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_search\external\get_results */ -final class get_results_test extends \externallib_advanced_testcase { - +final class get_results_test extends \core_external\tests\externallib_testcase { public function setUp(): void { parent::setUp(); $this->resetAfterTest(); diff --git a/public/search/tests/external/get_search_areas_list_test.php b/public/search/tests/external/get_search_areas_list_test.php index feafc3ded6d..5efa4fd3be6 100644 --- a/public/search/tests/external/get_search_areas_list_test.php +++ b/public/search/tests/external/get_search_areas_list_test.php @@ -18,11 +18,6 @@ namespace core_search\external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the get_search_areas_list external function. * @@ -32,8 +27,8 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_search\external\get_search_areas_list */ -final class get_search_areas_list_test extends \externallib_advanced_testcase { - +final class get_search_areas_list_test extends \core_external\tests\externallib_testcase { + #[\Override] public function setUp(): void { parent::setUp(); $this->resetAfterTest(); diff --git a/public/search/tests/external/get_top_results_test.php b/public/search/tests/external/get_top_results_test.php index 084b303d698..d5eabd1a786 100644 --- a/public/search/tests/external/get_top_results_test.php +++ b/public/search/tests/external/get_top_results_test.php @@ -18,11 +18,6 @@ namespace core_search\external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the get_top_results external function. * @@ -32,8 +27,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_search\external\get_top_results */ -final class get_top_results_test extends \externallib_advanced_testcase { - +final class get_top_results_test extends \core_external\tests\externallib_testcase { public function setUp(): void { parent::setUp(); $this->resetAfterTest(); diff --git a/public/search/tests/external/view_results_test.php b/public/search/tests/external/view_results_test.php index 038741c397d..7018e267db8 100644 --- a/public/search/tests/external/view_results_test.php +++ b/public/search/tests/external/view_results_test.php @@ -18,11 +18,6 @@ namespace core_search\external; use core_external\external_api; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Tests for the view_results external function. * @@ -32,8 +27,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @coversDefaultClass \core_search\external\view_results */ -final class view_results_test extends \externallib_advanced_testcase { - +final class view_results_test extends \core_external\tests\externallib_testcase { public function setUp(): void { parent::setUp(); $this->resetAfterTest(); diff --git a/public/sms/tests/external/sms_gateway_status_test.php b/public/sms/tests/external/sms_gateway_status_test.php index fbdf50d4e01..535be46b43d 100644 --- a/public/sms/tests/external/sms_gateway_status_test.php +++ b/public/sms/tests/external/sms_gateway_status_test.php @@ -18,11 +18,6 @@ declare(strict_types=1); namespace core_sms\external; -defined('MOODLE_INTERNAL') || die(); - -global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - /** * Test the webservice to change the status of a gateway. * @@ -31,8 +26,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @covers \core_sms\external\sms_gateway_status::execute */ -final class sms_gateway_status_test extends \externallib_advanced_testcase { - +final class sms_gateway_status_test extends \core_external\tests\externallib_testcase { public function test_execute(): void { $this->resetAfterTest(); $this->setAdminUser(); diff --git a/public/tag/tests/external/external_test.php b/public/tag/tests/external/external_test.php index fd2ce78e83e..64cb808f3b3 100644 --- a/public/tag/tests/external/external_test.php +++ b/public/tag/tests/external/external_test.php @@ -14,6 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +namespace core_tag\external; + +use core_external\external_api; + /** * Unit tests for WS in tags * @@ -22,19 +26,7 @@ * @copyright 2015 Marina Glancy * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -namespace core_tag\external; - -use externallib_advanced_testcase; -use core_external\external_api; - -defined('MOODLE_INTERNAL') || die(); - -global $CFG; - -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); - -final class external_test extends externallib_advanced_testcase { +final class external_test extends \core_external\tests\externallib_testcase { /** * Test update_categories */ diff --git a/public/user/tests/externallib_test.php b/public/user/tests/externallib_test.php index 0c4a61647ea..d97e8b2e190 100644 --- a/public/user/tests/externallib_test.php +++ b/public/user/tests/externallib_test.php @@ -29,13 +29,11 @@ namespace core_user; use core_external\external_api; use core_files_external; use core_user_external; -use externallib_advanced_testcase; defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); require_once($CFG->dirroot . '/user/externallib.php'); require_once($CFG->dirroot . '/files/externallib.php'); @@ -45,8 +43,7 @@ require_once($CFG->dirroot . '/files/externallib.php'); * @package core_user * @covers \core_user_external */ -final class externallib_test extends externallib_advanced_testcase { - +final class externallib_test extends \core_external\tests\externallib_testcase { /** * Test get_users */ diff --git a/public/webservice/tests/externallib_test.php b/public/webservice/tests/externallib_test.php index 372d02b334c..1fea9cb6416 100644 --- a/public/webservice/tests/externallib_test.php +++ b/public/webservice/tests/externallib_test.php @@ -17,14 +17,12 @@ namespace core_webservice; use core_external\external_api; -use externallib_advanced_testcase; use core\tests\session\mock_handler; defined('MOODLE_INTERNAL') || die(); global $CFG; require_once($CFG->dirroot . '/webservice/externallib.php'); -require_once($CFG->dirroot . '/webservice/tests/helpers.php'); /** * External course functions unit tests @@ -35,7 +33,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php'); * @copyright 2012 Paul Charsley * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -final class externallib_test extends externallib_advanced_testcase { +final class externallib_test extends \core_external\tests\externallib_testcase { #[\Override] public function setUp(): void { // Calling parent is good, always