X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FMessageTest.php;h=e745960a45d3307c760c29ab11de5e1cfb2d4bc3;hb=8f1d9e171891a5f1613ae4819dbb140261333f83;hp=912bffe6459a49e060d83284f30f46766273075d;hpb=967ead16680077f4734ba668cd4104c789a3b9ff;p=lhc%2Fweb%2Fwiklou.git
diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index 912bffe645..e745960a45 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -2,6 +2,9 @@
use Wikimedia\TestingAccessWrapper;
+/**
+ * @group Database
+ */
class MessageTest extends MediaWikiLangTestCase {
protected function setUp() {
@@ -22,9 +25,9 @@ class MessageTest extends MediaWikiLangTestCase {
$this->assertSame( $key, $message->getKey() );
$this->assertSame( $params, $message->getParams() );
- $this->assertEquals( $expectedLang, $message->getLanguage() );
+ $this->assertSame( $expectedLang->getCode(), $message->getLanguage()->getCode() );
- $messageSpecifier = $this->getMockForAbstractClass( 'MessageSpecifier' );
+ $messageSpecifier = $this->getMockForAbstractClass( MessageSpecifier::class );
$messageSpecifier->expects( $this->any() )
->method( 'getKey' )->will( $this->returnValue( $key ) );
$messageSpecifier->expects( $this->any() )
@@ -33,7 +36,7 @@ class MessageTest extends MediaWikiLangTestCase {
$this->assertSame( $key, $message->getKey() );
$this->assertSame( $params, $message->getParams() );
- $this->assertEquals( $expectedLang, $message->getLanguage() );
+ $this->assertSame( $expectedLang->getCode(), $message->getLanguage()->getCode() );
}
public static function provideConstructor() {
@@ -197,16 +200,16 @@ class MessageTest extends MediaWikiLangTestCase {
* @covers ::wfMessage
*/
public function testWfMessage() {
- $this->assertInstanceOf( 'Message', wfMessage( 'mainpage' ) );
- $this->assertInstanceOf( 'Message', wfMessage( 'i-dont-exist-evar' ) );
+ $this->assertInstanceOf( Message::class, wfMessage( 'mainpage' ) );
+ $this->assertInstanceOf( Message::class, wfMessage( 'i-dont-exist-evar' ) );
}
/**
* @covers Message::newFromKey
*/
public function testNewFromKey() {
- $this->assertInstanceOf( 'Message', Message::newFromKey( 'mainpage' ) );
- $this->assertInstanceOf( 'Message', Message::newFromKey( 'i-dont-exist-evar' ) );
+ $this->assertInstanceOf( Message::class, Message::newFromKey( 'mainpage' ) );
+ $this->assertInstanceOf( Message::class, Message::newFromKey( 'i-dont-exist-evar' ) );
}
/**
@@ -396,15 +399,15 @@ class MessageTest extends MediaWikiLangTestCase {
$this->assertSame( 'example &', $msg->escaped() );
}
+ /**
+ * @covers CoreTagHooks::html
+ */
public function testRawHtmlInMsg() {
- global $wgParserConf;
$this->setMwGlobals( 'wgRawHtml', true );
// We have to reset the core hook registration.
// to register the html hook
MessageCache::destroyInstance();
- $this->setMwGlobals( 'wgParser',
- ObjectFactory::constructClassInstance( $wgParserConf['class'], [ $wgParserConf ] )
- );
+ $this->overrideMwServices();
$msg = new RawMessage( '' );
$txt = '<html> tags cannot be' .
@@ -467,7 +470,6 @@ class MessageTest extends MediaWikiLangTestCase {
/**
* FIXME: This should not need database, but Language#formatExpiry does (T57912)
- * @group Database
* @covers Message::expiryParam
* @covers Message::expiryParams
*/
@@ -810,7 +812,7 @@ class MessageTest extends MediaWikiLangTestCase {
$msg = unserialize( serialize( $msg ) );
$this->assertSame( '(foo)', $msg->parse() );
$title = TestingAccessWrapper::newFromObject( $msg )->title;
- $this->assertInstanceOf( 'Title', $title );
+ $this->assertInstanceOf( Title::class, $title );
$this->assertSame( 'Testing', $title->getFullText() );
$msg = new Message( 'mainpage' );