diff options
Diffstat (limited to 'tests/phpunit/includes/cache/MessageCacheTest.php')
| -rw-r--r-- | tests/phpunit/includes/cache/MessageCacheTest.php | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/tests/phpunit/includes/cache/MessageCacheTest.php b/tests/phpunit/includes/cache/MessageCacheTest.php index b7f6967a77dc..c27bbad8a5de 100644 --- a/tests/phpunit/includes/cache/MessageCacheTest.php +++ b/tests/phpunit/includes/cache/MessageCacheTest.php @@ -1,6 +1,5 @@ <?php -use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\SlotRecord; use Wikimedia\TestingAccessWrapper; @@ -15,7 +14,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { protected function setUp(): void { parent::setUp(); $this->configureLanguages(); - MediaWikiServices::getInstance()->getMessageCache()->enable(); + $this->getServiceContainer()->getMessageCache()->enable(); } /** @@ -64,7 +63,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { if ( $content === null ) { $content = $lang; } - if ( $lang !== MediaWikiServices::getInstance()->getContentLanguage()->getCode() ) { + if ( $lang !== $this->getServiceContainer()->getContentLanguage()->getCode() ) { $title = "$title/$lang"; } @@ -87,7 +86,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { * @dataProvider provideMessagesForFallback */ public function testMessageFallbacks( $message, $lang, $expectedContent ) { - $result = MediaWikiServices::getInstance()->getMessageCache()->get( $message, true, $lang ); + $result = $this->getServiceContainer()->getMessageCache()->get( $message, true, $lang ); $this->assertEquals( $expectedContent, $result, "Message fallback failed." ); } @@ -106,9 +105,9 @@ class MessageCacheTest extends MediaWikiLangTestCase { } public function testReplaceMsg() { - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $message = 'go'; - $uckey = MediaWikiServices::getInstance()->getContentLanguage()->ucfirst( $message ); + $uckey = $this->getServiceContainer()->getContentLanguage()->ucfirst( $message ); $oldText = $messageCache->get( $message ); // "Ausführen" $dbw = wfGetDB( DB_PRIMARY ); @@ -149,7 +148,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { ] ] ); - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $messageCache->enable(); // Populate one key @@ -205,7 +204,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { $dbr = wfGetDB( DB_REPLICA ); - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $messageCache->getMsgFromNamespace( 'allpages', $wgLanguageCode ); $this->assertSame( 0, $dbr->trxLevel() ); @@ -221,7 +220,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { public function testNoDBAccessNonContentLanguage() { $dbr = wfGetDB( DB_REPLICA ); - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $messageCache->getMsgFromNamespace( 'allpages/nl', 'nl' ); $this->assertSame( 0, $dbr->trxLevel() ); @@ -256,11 +255,11 @@ class MessageCacheTest extends MediaWikiLangTestCase { $importRevision->setContent( SlotRecord::MAIN, $content ); $importRevision->setUsername( 'ext>Alan Smithee' ); - $importer = MediaWikiServices::getInstance()->getWikiRevisionOldRevisionImporterNoUpdates(); + $importer = $this->getServiceContainer()->getWikiRevisionOldRevisionImporterNoUpdates(); $importer->import( $importRevision ); // Now, load the message from the wiki page - $messageCache = MediaWikiServices::getInstance()->getMessageCache(); + $messageCache = $this->getServiceContainer()->getMessageCache(); $messageCache->enable(); $messageCache = TestingAccessWrapper::newFromObject( $messageCache ); @@ -280,7 +279,7 @@ class MessageCacheTest extends MediaWikiLangTestCase { */ public function testIsMainCacheable( $code, $message, $expected ) { $messageCache = TestingAccessWrapper::newFromObject( - MediaWikiServices::getInstance()->getMessageCache() ); + $this->getServiceContainer()->getMessageCache() ); $this->assertSame( $expected, $messageCache->isMainCacheable( $message, $code ) ); } |