From 75942da3312a2ed5afe19d46b9edc46d10351deb Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Thu, 6 Mar 2025 18:02:57 +0000 Subject: [PATCH] MDL-84765 aiprovider_azureai: ensure tests refer to correct provider. --- .../tests/process_generate_image_test.php | 12 ++++++------ .../azureai/tests/process_generate_text_test.php | 12 +++++------- .../tests/process_summarise_text_test.php | 11 +++++------ ai/provider/azureai/tests/provider_test.php | 16 ++++++++++------ 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/ai/provider/azureai/tests/process_generate_image_test.php b/ai/provider/azureai/tests/process_generate_image_test.php index 243b576b6ad..6b6f62bb729 100644 --- a/ai/provider/azureai/tests/process_generate_image_test.php +++ b/ai/provider/azureai/tests/process_generate_image_test.php @@ -17,7 +17,7 @@ namespace aiprovider_azureai; use core_ai\aiactions\base; -use core_ai\provider; +use core_ai\manager; use GuzzleHttp\Psr7\Response; /** @@ -26,14 +26,14 @@ use GuzzleHttp\Psr7\Response; * @package aiprovider_azureai * @copyright 2024 Matt Porritt * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @covers \core_ai\provider\azureai + * @covers \aiprovider_azureai\process_generate_image */ final class process_generate_image_test extends \advanced_testcase { /** @var string A successful response in JSON format. */ protected string $responsebodyjson; - /** @var \core_ai\manager */ - private $manager; + /** @var manager $manager */ + private manager $manager; /** @var provider The provider that will process the action. */ protected provider $provider; @@ -399,7 +399,7 @@ final class process_generate_image_test extends \advanced_testcase { ], ]; $provider = $this->manager->create_provider_instance( - classname: '\aiprovider_openai\provider', + classname: provider::class, name: 'dummy', config: $config, ); @@ -554,7 +554,7 @@ final class process_generate_image_test extends \advanced_testcase { ], ]; $provider = $this->manager->create_provider_instance( - classname: '\aiprovider_openai\provider', + classname: provider::class, name: 'dummy', config: $config, ); diff --git a/ai/provider/azureai/tests/process_generate_text_test.php b/ai/provider/azureai/tests/process_generate_text_test.php index 18f65b4f372..a11ee50500f 100644 --- a/ai/provider/azureai/tests/process_generate_text_test.php +++ b/ai/provider/azureai/tests/process_generate_text_test.php @@ -16,10 +16,8 @@ namespace aiprovider_azureai; -use aiprovider_azureai\process_generate_text; use core_ai\aiactions\base; -use core_ai\aiactions\generate_text; -use core_ai\provider; +use core_ai\manager; use GuzzleHttp\Psr7\Response; /** @@ -36,8 +34,8 @@ final class process_generate_text_test extends \advanced_testcase { /** @var string A successful response in JSON format. */ protected string $responsebodyjson; - /** @var \core_ai\manager */ - private $manager; + /** @var manager $manager */ + private manager $manager; /** @var provider The provider that will process the action. */ protected provider $provider; @@ -336,7 +334,7 @@ final class process_generate_text_test extends \advanced_testcase { ], ]; $provider = $this->manager->create_provider_instance( - classname: '\aiprovider_openai\provider', + classname: provider::class, name: 'dummy', config: $config, ); @@ -435,7 +433,7 @@ final class process_generate_text_test extends \advanced_testcase { ], ]; $provider = $this->manager->create_provider_instance( - classname: '\aiprovider_openai\provider', + classname: provider::class, name: 'dummy', config: $config, ); diff --git a/ai/provider/azureai/tests/process_summarise_text_test.php b/ai/provider/azureai/tests/process_summarise_text_test.php index cb272911529..57297956a4c 100644 --- a/ai/provider/azureai/tests/process_summarise_text_test.php +++ b/ai/provider/azureai/tests/process_summarise_text_test.php @@ -16,9 +16,8 @@ namespace aiprovider_azureai; -use aiprovider_azureai\process_summarise_text; use core_ai\aiactions\base; -use core_ai\provider; +use core_ai\manager; use GuzzleHttp\Psr7\Response; /** @@ -35,8 +34,8 @@ final class process_summarise_text_test extends \advanced_testcase { /** @var string A successful response in JSON format. */ protected string $responsebodyjson; - /** @var \core_ai\manager */ - private $manager; + /** @var manager $manager */ + private manager $manager; /** @var provider The provider that will process the action. */ protected provider $provider; @@ -328,7 +327,7 @@ final class process_summarise_text_test extends \advanced_testcase { ], ]; $provider = $this->manager->create_provider_instance( - classname: '\aiprovider_openai\provider', + classname: provider::class, name: 'dummy', config: $config, ); @@ -428,7 +427,7 @@ final class process_summarise_text_test extends \advanced_testcase { ], ]; $provider = $this->manager->create_provider_instance( - classname: '\aiprovider_openai\provider', + classname: provider::class, name: 'dummy', config: $config, ); diff --git a/ai/provider/azureai/tests/provider_test.php b/ai/provider/azureai/tests/provider_test.php index 6d4906794c4..1a52c74a812 100644 --- a/ai/provider/azureai/tests/provider_test.php +++ b/ai/provider/azureai/tests/provider_test.php @@ -16,21 +16,23 @@ namespace aiprovider_azureai; +use core_ai\manager; + /** * Test Azure AI provider methods. * * @package aiprovider_azureai * @copyright 2024 Matt Porritt * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later - * @covers \core_ai\provider\azureai + * @covers \aiprovider_azureai\provider */ final class provider_test extends \advanced_testcase { - /** @var \core_ai\manager */ - private $manager; + /** @var manager $manager */ + private manager $manager; - /** @var \core_ai\provider */ - private $provider; + /** @var provider $provider */ + private provider $provider; /** * Overriding setUp() function to always reset after tests. @@ -83,8 +85,10 @@ final class provider_test extends \advanced_testcase { 'enableglobalratelimit' => true, 'globalratelimit' => 5, ]; + + /** @var provider $provider */ $provider = $this->manager->create_provider_instance( - classname: '\aiprovider_openai\provider', + classname: provider::class, name: 'dummy', config: $config, );