X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FWatchedItemUnitTest.php;h=b4eaa765e9c30b4aac3533c83a9f2b536c753445;hb=deb22bced75964dc1d5b8783ab0f6a7e66ee945a;hp=db7f16c655a91d7cc488c3601c5000f9b91dcd4c;hpb=99e8d45b50993113b26ced7c8bb91e44c7d908b1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/WatchedItemUnitTest.php b/tests/phpunit/includes/WatchedItemUnitTest.php
index db7f16c655..b4eaa765e9 100644
--- a/tests/phpunit/includes/WatchedItemUnitTest.php
+++ b/tests/phpunit/includes/WatchedItemUnitTest.php
@@ -5,30 +5,13 @@
  *
  * @covers WatchedItem
  */
-class WatchedItemUnitTest extends MediaWikiTestCase {
-
-	/**
-	 * @param int $id
-	 *
-	 * @return PHPUnit_Framework_MockObject_MockObject|User
-	 */
-	private function getMockUser( $id ) {
-		$user = $this->getMock( User::class );
-		$user->expects( $this->any() )
-			->method( 'getId' )
-			->will( $this->returnValue( $id ) );
-		$user->expects( $this->any() )
-			->method( 'isAllowed' )
-			->will( $this->returnValue( true ) );
-		return $user;
-	}
+class WatchedItemUnitTest extends PHPUnit_Framework_TestCase {
 
 	public function provideUserTitleTimestamp() {
-		$user = $this->getMockUser( 111 );
 		return [
-			[ $user, Title::newFromText( 'SomeTitle' ), null ],
-			[ $user, Title::newFromText( 'SomeTitle' ), '20150101010101' ],
-			[ $user, new TitleValue( 0, 'TVTitle', 'frag' ), '20150101010101' ],
+			[ User::newFromId( 111 ), Title::newFromText( 'SomeTitle' ), null ],
+			[ User::newFromId( 111 ), Title::newFromText( 'SomeTitle' ), '20150101010101' ],
+			[ User::newFromId( 111 ), new TitleValue( 0, 'TVTitle', 'frag' ), '20150101010101' ],
 		];
 	}
 
@@ -68,13 +51,15 @@ class WatchedItemUnitTest extends MediaWikiTestCase {
 			->method( 'loadWatchedItem' )
 			->with( $user, $linkTarget )
 			->will( $this->returnValue( new WatchedItem( $user, $linkTarget, $timestamp ) ) );
-		$this->setService( 'WatchedItemStore', $store );
+		$scopedOverride = WatchedItemStore::overrideDefaultInstance( $store );
 
 		$item = WatchedItem::fromUserTitle( $user, $linkTarget, User::IGNORE_USER_RIGHTS );
 
 		$this->assertEquals( $user, $item->getUser() );
 		$this->assertEquals( $linkTarget, $item->getLinkTarget() );
 		$this->assertEquals( $timestamp, $item->getNotificationTimestamp() );
+
+		ScopedCallback::consume( $scopedOverride );
 	}
 
 	/**
@@ -100,10 +85,12 @@ class WatchedItemUnitTest extends MediaWikiTestCase {
 					return true;
 				}
 			) );
-		$this->setService( 'WatchedItemStore', $store );
+		$scopedOverride = WatchedItemStore::overrideDefaultInstance( $store );
 
 		$item = new WatchedItem( $user, $linkTarget, $timestamp );
 		$item->resetNotificationTimestamp( $force, $oldid );
+
+		ScopedCallback::consume( $scopedOverride );
 	}
 
 	public function testAddWatch() {
@@ -170,15 +157,17 @@ class WatchedItemUnitTest extends MediaWikiTestCase {
 		$store->expects( $this->once() )
 			->method( 'duplicateAllAssociatedEntries' )
 			->with( $oldTitle, $newTitle );
-		$this->setService( 'WatchedItemStore', $store );
+		$scopedOverride = WatchedItemStore::overrideDefaultInstance( $store );
 
 		WatchedItem::duplicateEntries( $oldTitle, $newTitle );
+
+		ScopedCallback::consume( $scopedOverride );
 	}
 
 	public function testBatchAddWatch() {
-		$itemOne = new WatchedItem( $this->getMockUser( 1 ), new TitleValue( 0, 'Title1' ), null );
+		$itemOne = new WatchedItem( User::newFromId( 1 ), new TitleValue( 0, 'Title1' ), null );
 		$itemTwo = new WatchedItem(
-			$this->getMockUser( 3 ),
+			User::newFromId( 3 ),
 			Title::newFromText( 'Title2' ),
 			'20150101010101'
 		);
@@ -204,9 +193,11 @@ class WatchedItemUnitTest extends MediaWikiTestCase {
 					$itemTwo->getTitle()->getTalkPage(),
 				]
 			);
-		$this->setService( 'WatchedItemStore', $store );
+		$scopedOverride = WatchedItemStore::overrideDefaultInstance( $store );
 
 		WatchedItem::batchAddWatch( [ $itemOne, $itemTwo ] );
+
+		ScopedCallback::consume( $scopedOverride );
 	}
 
 }