X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FSiteStatsTest.php;h=ff9fa7b34a09b2c5411901556e76823706ac3662;hp=56bde5da08623343576a90a874b8a80fabab45bd;hb=af80076034fb734d652eb043c523c1d8df974e51;hpb=3f59cb9f3a53ad28f8a95fe299c5de6abd24b453

diff --git a/tests/phpunit/includes/SiteStatsTest.php b/tests/phpunit/includes/SiteStatsTest.php
index 56bde5da08..ff9fa7b34a 100644
--- a/tests/phpunit/includes/SiteStatsTest.php
+++ b/tests/phpunit/includes/SiteStatsTest.php
@@ -6,29 +6,22 @@ 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 jobs that might have been left behind by other tests
-		$jobq->get( 'htmlCacheUpdate' )->delete();
-		$jobq->get( 'recentChangesUpdate' )->delete();
-		$jobq->get( 'userGroupExpiry' )->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)'
 		);
 
 		$jobq->get( 'null' )->delete();  // clear jobqueue
-		$this->assertEquals( 0, $jobq->get( 'null' )->getSize(),
+		$this->assertSame( 0, $jobq->get( 'null' )->getSize(),
 			'Job queue for NullJob has been cleaned' );
 
 		$cache->delete( $cache->makeKey( 'SiteStats', 'jobscount' ) );
@@ -36,7 +29,7 @@ class SiteStatsTest extends MediaWikiTestCase {
 			'jobs count is kept in process cache' );
 
 		$cache->clearProcessCache();
-		$this->assertEquals( 0, SiteStats::jobs() );
+		$this->assertSame( 0, SiteStats::jobs() );
 	}
 
 }