X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FSiteStatsTest.php;h=b0d89a6ae541bb4d5cd2ada2220ba6a64ff0096b;hb=d64677c1be20da3b81fe104011573f93d2400771;hp=cdbf9fd9440c4179437cf6d16eb396bbfcda3b68;hpb=236488d398046838059f758b0915341648b64c7b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/SiteStatsTest.php b/tests/phpunit/includes/SiteStatsTest.php
index cdbf9fd944..b0d89a6ae5 100644
--- a/tests/phpunit/includes/SiteStatsTest.php
+++ b/tests/phpunit/includes/SiteStatsTest.php
@@ -6,21 +6,15 @@ class SiteStatsTest extends MediaWikiTestCase {
 	 * @covers SiteStats::jobs
 	 */
 	function testJobsCountGetCached() {
-		$this->setService( 'MainWANObjectCache',
-			new WANObjectCache( [ 'cache' => new HashBagOStuff() ] ) );
-		$cache = \MediaWiki\MediaWikiServices::getInstance()->getMainWANObjectCache();
+		$cache = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] );
+		$this->setService( 'MainWANObjectCache', $cache );
 		$jobq = JobQueueGroup::singleton();
 
-		// Delete EditPage jobs that might have been left behind by other tests
-		$jobq->get( 'htmlCacheUpdate' )->delete();
-		$jobq->get( 'recentChangesUpdate' )->delete();
-		$cache->delete( $cache->makeKey( 'SiteStats', 'jobscount' ) );
-
-		$jobq->push( new NullJob( Title::newMainPage(), [] ) );
+		$jobq->push( Job::factory( 'null', Title::newMainPage(), [] ) );
 		$this->assertEquals( 1, SiteStats::jobs(),
 			 'A single job enqueued bumps jobscount stat to 1' );
 
-		$jobq->push( new NullJob( Title::newMainPage(), [] ) );
+		$jobq->push( Job::factory( 'null', Title::newMainPage(), [] ) );
 		$this->assertEquals( 1, SiteStats::jobs(),
 			'SiteStats::jobs() count does not reflect addition ' .
 			'of a second job (cached)'