MDL-77989 core: Fix uses of legacy external API

hjlinde · Apr 21, 2023 · fcba0cb · fcba0cb
1 parent 1a53cbb
commit fcba0cb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/course/format/tests/external/file_handlers_test.php b/course/format/tests/external/file_handlers_test.php
@@ -16,12 +16,13 @@
 
 namespace core_courseformat\external;
 
+use core_external\external_api;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
 require_once($CFG->dirroot . '/webservice/tests/helpers.php');
 
-use external_api;
 use dndupload_handler;
 
 /**

diff --git a/question/tests/externallib_test.php b/question/tests/externallib_test.php
@@ -16,6 +16,7 @@
 
 namespace core_question;
 
+use core_external\restricted_context_exception;
 use core_question_external;
 use externallib_advanced_testcase;
 
@@ -322,7 +323,7 @@ public function test_get_random_question_summaries_restricted_context() {
             // to be reset afterwards.
             core_question_external::get_random_question_summaries(1, false, [], $systemcontext->id);
         } catch (\Exception $e) {
-            $this->assertInstanceOf('restricted_context_exception', $e);
+            $this->assertInstanceOf(restricted_context_exception::class, $e);
         }
         // Reset the restriction so that other tests don't fail aftwards.
         core_question_external::set_context_restriction($systemcontext);

diff --git a/webservice/tests/lib_test.php b/webservice/tests/lib_test.php
@@ -148,7 +148,7 @@ public function test_init_service_class() {
      * Tests update_token_lastaccess() function.
      */
     public function test_update_token_lastaccess() {
-        global $DB;
+        global $DB, $USER;
 
         $this->resetAfterTest(true);
 
@@ -167,7 +167,12 @@ public function test_update_token_lastaccess() {
         $DB->insert_record('external_services', $webservice);
 
         // Add token.
-        $tokenstr = external_create_service_token($webservice->name, \context_system::instance()->id);
+        $tokenstr = \core_external\util::generate_token(
+            EXTERNAL_TOKEN_EMBEDDED,
+            \core_external\util::get_service_by_name($webservice->name),
+            $USER->id,
+            \core\context\system::instance()
+        );
         $token = $DB->get_record('external_tokens', ['token' => $tokenstr]);
 
         // Trigger last access once (at current time).