tests: Don't depend on Message implementation details

You're not really supposed to know how Message represents the
parameters internally.

Change-Id: Idb554f91aded1402b34932fddcb77beaa1dca0d5
This commit is contained in:
Bartosz Dziewoński 2024-04-02 23:15:08 +02:00
parent 86d3a2dcad
commit 20524dde2c
3 changed files with 8 additions and 5 deletions

View file

@ -4,6 +4,7 @@ use MediaWiki\Context\DerivativeContext;
use MediaWiki\Context\RequestContext;
use MediaWiki\Linker\Linker;
use MediaWiki\MainConfigNames;
use MediaWiki\Message\Message;
use MediaWiki\Permissions\SimpleAuthority;
use MediaWiki\SpecialPage\SpecialPage;
use MediaWiki\Title\Title;
@ -123,12 +124,12 @@ class LogFormatterTest extends MediaWikiLangTestCase {
$this->assertEquals( $paramsWithoutTools[1], $paramsWithTools[1] );
$this->assertEquals( $paramsWithoutTools[2], $paramsWithTools[2] );
$this->assertEquals( $userLink, $paramsWithoutTools[0]['raw'] );
$this->assertEquals( $userLink . $userTools, $paramsWithTools[0]['raw'] );
$this->assertEquals( Message::rawParam( $userLink ), $paramsWithoutTools[0] );
$this->assertEquals( Message::rawParam( $userLink . $userTools ), $paramsWithTools[0] );
$this->assertEquals( $this->user->getName(), $paramsWithoutTools[1] );
$this->assertEquals( $titleLink, $paramsWithoutTools[2]['raw'] );
$this->assertEquals( Message::rawParam( $titleLink ), $paramsWithoutTools[2] );
}
/**

View file

@ -5,6 +5,7 @@ namespace MediaWiki\Tests\Rest\Handler;
use ApiUsageException;
use MediaWiki\Config\HashConfig;
use MediaWiki\MainConfigNames;
use MediaWiki\Message\Message;
use MediaWiki\Rest\Handler\CreationHandler;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\RequestData;
@ -456,7 +457,7 @@ class CreationHandlerTest extends MediaWikiIntegrationTestCase {
yield "badtoken" => [
new ApiUsageException(
null,
Status::newFatal( 'apierror-badtoken', [ 'plaintext' => 'BAD' ] )
Status::newFatal( 'apierror-badtoken', Message::plaintextParam( 'BAD' ) )
),
new LocalizedHttpException(
new MessageValue(

View file

@ -8,6 +8,7 @@ use MediaWiki\Config\HashConfig;
use MediaWiki\Languages\LanguageNameUtils;
use MediaWiki\Linker\LinkRenderer;
use MediaWiki\MainConfigNames;
use MediaWiki\Message\Message;
use MediaWiki\Parser\MagicWordFactory;
use MediaWiki\Parser\Parsoid\ParsoidParserFactory;
use MediaWiki\Rest\Handler\UpdateHandler;
@ -562,7 +563,7 @@ class UpdateHandlerTest extends MediaWikiLangTestCase {
yield "badtoken" => [
new ApiUsageException(
null,
Status::newFatal( 'apierror-badtoken', [ 'plaintext' => 'BAD' ] )
Status::newFatal( 'apierror-badtoken', Message::plaintextParam( 'BAD' ) )
),
new LocalizedHttpException(
new MessageValue(