Merge "Revert "selenium: add new message banner test to user spec""

[lhc/web/wiklou.git] / tests / phpunit / includes / MessageTest.php

diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index 912bffe..fa77824 100644 (file)
--- 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() {
@@ -24,7 +27,7 @@ class MessageTest extends MediaWikiLangTestCase {
                $this->assertSame( $params, $message->getParams() );
                $this->assertEquals( $expectedLang, $message->getLanguage() );
 
-               $messageSpecifier = $this->getMockForAbstractClass( 'MessageSpecifier' );
+               $messageSpecifier = $this->getMockForAbstractClass( MessageSpecifier::class );
                $messageSpecifier->expects( $this->any() )
                        ->method( 'getKey' )->will( $this->returnValue( $key ) );
                $messageSpecifier->expects( $this->any() )
@@ -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' ) );
        }
 
        /**
@@ -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( '(<a>foo</a>)', $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' );