wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-11-30 17:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use $this->getServiceContainer()

Browse source 
Use
	$this->getServiceContainer()
instead of
	MediaWikiServices::getInstance()
in tests.

Change-Id: I5e56524b85ba6e34cecffba2f24fb44b3f66ec8f
This commit is contained in:
Fomafix 2023-10-26 19:55:00 +00:00 committed by Jforrester
parent bac8c8af79
commit 96fad3ea99
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/phpunit/CiteCSSFileModuleTest.php
View file

@ -3,7 +3,6 @@
namespace Cite\Tests; namespace Cite\Tests;
use Cite\ResourceLoader\CiteCSSFileModule; use Cite\ResourceLoader\CiteCSSFileModule;
use MediaWiki\MediaWikiServices;
use MediaWiki\ResourceLoader\Context; use MediaWiki\ResourceLoader\Context;
/** /**
@ -18,7 +17,7 @@ class CiteCSSFileModuleTest extends \MediaWikiIntegrationTestCase {
$this->setService( $this->setService(
'ContentLanguage', 'ContentLanguage',
MediaWikiServices::getInstance()->getLanguageFactory()->getLanguage( 'fa' ) $this->getServiceContainer()->getLanguageFactory()->getLanguage( 'fa' )
); );
} }

3
tests/phpunit/CiteDbTest.php
View file

@ -2,7 +2,6 @@
namespace Cite\Tests; namespace Cite\Tests;
use MediaWiki\MediaWikiServices;
use MediaWiki\Title\Title; use MediaWiki\Title\Title;
use ParserOptions; use ParserOptions;
@ -23,7 +22,7 @@ class CiteDbTest extends \MediaWikiIntegrationTestCase {
public function testReferenceStackError() { public function testReferenceStackError() {
$this->insertPage( 'Cite-tracking-category-cite-error', '{{PAGENAME}}', NS_MEDIAWIKI ); $this->insertPage( 'Cite-tracking-category-cite-error', '{{PAGENAME}}', NS_MEDIAWIKI );
$services = MediaWikiServices::getInstance(); $services = $this->getServiceContainer();
// Reset the MessageCache in order to force it to clone a new parser. // Reset the MessageCache in order to force it to clone a new parser.
$services->resetServiceForTesting( 'MessageCache' ); $services->resetServiceForTesting( 'MessageCache' );
$services->getMessageCache()->enable(); $services->getMessageCache()->enable();

5
tests/phpunit/CiteHooksTest.php
View file

@ -4,7 +4,6 @@ namespace Cite\Tests;
use ApiQuerySiteinfo; use ApiQuerySiteinfo;
use Cite\Hooks\CiteHooks; use Cite\Hooks\CiteHooks;
use MediaWiki\MediaWikiServices;
use MediaWiki\User\StaticUserOptionsLookup; use MediaWiki\User\StaticUserOptionsLookup;
/** /**
@ -20,7 +19,7 @@ class CiteHooksTest extends \MediaWikiIntegrationTestCase {
public function testOnResourceLoaderGetConfigVars() { public function testOnResourceLoaderGetConfigVars() {
$vars = []; $vars = [];
$config = MediaWikiServices::getInstance()->getMainConfig(); $config = $this->getServiceContainer()->getMainConfig();
$citeHooks = new CiteHooks( new StaticUserOptionsLookup( [] ) ); $citeHooks = new CiteHooks( new StaticUserOptionsLookup( [] ) );
$citeHooks->onResourceLoaderGetConfigVars( $vars, 'vector', $config ); $citeHooks->onResourceLoaderGetConfigVars( $vars, 'vector', $config );
@ -36,7 +35,7 @@ class CiteHooksTest extends \MediaWikiIntegrationTestCase {
$api = $this->createMock( ApiQuerySiteinfo::class ); $api = $this->createMock( ApiQuerySiteinfo::class );
$api->expects( $this->once() ) $api->expects( $this->once() )
->method( 'getConfig' ) ->method( 'getConfig' )
->willReturn( MediaWikiServices::getInstance()->getMainConfig() ); ->willReturn( $this->getServiceContainer()->getMainConfig() );
$data = []; $data = [];