phpunit: use ->getServiceContainer() in integration tests

Change-Id: I38299cb65eeaadfdc0eb05db4e8c0b0119cfb37d

5 files changed, 8 insertions, 14 deletions

diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php
index 83bdb7ffb138..7bd0c888167e 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -17,7 +17,7 @@ class JobQueueTest extends MediaWikiIntegrationTestCase {
 
 		$this->tablesUsed[] = 'job';
 
-		$services = MediaWikiServices::getInstance();
+		$services = $this->getServiceContainer();
 		if ( $this->getCliArg( 'use-jobqueue' ) ) {
 			$name = $this->getCliArg( 'use-jobqueue' );
 			if ( !isset( $wgJobTypeConf[$name] ) ) {
diff --git a/tests/phpunit/includes/jobqueue/JobRunnerTest.php b/tests/phpunit/includes/jobqueue/JobRunnerTest.php
index dff08545a8f3..77795835cc71 100644
--- a/tests/phpunit/includes/jobqueue/JobRunnerTest.php
+++ b/tests/phpunit/includes/jobqueue/JobRunnerTest.php
@@ -1,6 +1,5 @@
 <?php
 
-use MediaWiki\MediaWikiServices;
 use MediaWiki\Page\DeletePage;
 
 /**
@@ -34,7 +33,7 @@ class JobRunnerTest extends MediaWikiIntegrationTestCase {
 
 		$this->assertTrue( $this->page->exists(), 'The created page exists' );
 
-		$this->jobRunner = MediaWikiServices::getInstance()->getJobRunner();
+		$this->jobRunner = $this->getServiceContainer()->getJobRunner();
 		$jobParams = [
 			'namespace' => $this->page->getNamespace(),
 			'title' => $this->page->getDBkey(),
diff --git a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
index 70372da559ca..9c76ff61b51c 100644
--- a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
+++ b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
@@ -1,7 +1,5 @@
 <?php
 
-use MediaWiki\MediaWikiServices;
-
 /**
  * @covers ClearUserWatchlistJob
  *
@@ -24,7 +22,7 @@ class ClearUserWatchlistJobTest extends MediaWikiIntegrationTestCase {
 	}
 
 	private function getWatchedItemStore() {
-		return MediaWikiServices::getInstance()->getWatchedItemStore();
+		return $this->getServiceContainer()->getWatchedItemStore();
 	}
 
 	public function testRun() {
diff --git a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
index c39df900e280..ae70f2a55700 100644
--- a/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
+++ b/tests/phpunit/includes/jobqueue/jobs/RefreshLinksJobTest.php
@@ -1,7 +1,5 @@
 <?php
 
-use MediaWiki\MediaWikiServices;
-
 /**
  * @covers RefreshLinksJob
  *
@@ -49,7 +47,7 @@ class RefreshLinksJobTest extends MediaWikiIntegrationTestCase {
 	// TODO: test partition
 
 	public function testRunForSinglePage() {
-		MediaWikiServices::getInstance()->getSlotRoleRegistry()->defineRoleWithModel(
+		$this->getServiceContainer()->getSlotRoleRegistry()->defineRoleWithModel(
 			'aux',
 			CONTENT_MODEL_WIKITEXT
 		);
@@ -59,7 +57,7 @@ class RefreshLinksJobTest extends MediaWikiIntegrationTestCase {
 		$page = $this->createPage( __METHOD__, [ 'main' => $mainContent, 'aux' => $auxContent ] );
 
 		// clear state
-		$parserCache = MediaWikiServices::getInstance()->getParserCache();
+		$parserCache = $this->getServiceContainer()->getParserCache();
 		$parserCache->deleteOptionsKey( $page );
 
 		$this->db->delete( 'pagelinks', '*', __METHOD__ );
@@ -84,7 +82,7 @@ class RefreshLinksJobTest extends MediaWikiIntegrationTestCase {
 	}
 
 	public function testRunForMultiPage() {
-		MediaWikiServices::getInstance()->getSlotRoleRegistry()->defineRoleWithModel(
+		$this->getServiceContainer()->getSlotRoleRegistry()->defineRoleWithModel(
 			'aux',
 			CONTENT_MODEL_WIKITEXT
 		);
@@ -100,7 +98,7 @@ class RefreshLinksJobTest extends MediaWikiIntegrationTestCase {
 		$page2 = $this->createPage( "$fname-2", [ 'main' => $mainContent, 'aux' => $auxContent ] );
 
 		// clear state
-		$parserCache = MediaWikiServices::getInstance()->getParserCache();
+		$parserCache = $this->getServiceContainer()->getParserCache();
 		$parserCache->deleteOptionsKey( $page1 );
 		$parserCache->deleteOptionsKey( $page2 );
 
diff --git a/tests/phpunit/includes/jobqueue/jobs/UserEditCountInitJobTest.php b/tests/phpunit/includes/jobqueue/jobs/UserEditCountInitJobTest.php
index f81227804d6b..32888bd72521 100644
--- a/tests/phpunit/includes/jobqueue/jobs/UserEditCountInitJobTest.php
+++ b/tests/phpunit/includes/jobqueue/jobs/UserEditCountInitJobTest.php
@@ -1,5 +1,4 @@
 <?php
-use MediaWiki\MediaWikiServices;
 
 /**
  * @group JobQueue
@@ -22,7 +21,7 @@ class UserEditCountInitJobTest extends MediaWikiIntegrationTestCase {
 		$user = $this->getMutableTestUser()->getUser();
 
 		if ( $startingEditCount !== false ) {
-			MediaWikiServices::getInstance()->getDbLoadBalancer()
+			$this->getServiceContainer()->getDbLoadBalancer()
 				->getConnectionRef( DB_PRIMARY )
 				->update(
 					'user',