From: Leszek Manicki <leszek.manicki@wikimedia.de>
Date: Wed, 20 Apr 2016 13:51:26 +0000 (+0200)
Subject: Assert jobs called from WIS::resetNotificationTimestamp are correct
X-Git-Tag: 1.31.0-rc.0~7146
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=70f5f90d4b105193f4bc3d72b6bc2d0ded5adf47;p=lhc%2Fweb%2Fwiklou.git

Assert jobs called from WIS::resetNotificationTimestamp are correct

This also adds tests for some previously untested paths.

Change-Id: Id95144c0bad90cfc123a4444a03aad91531d2332
---

diff --git a/tests/phpunit/includes/WatchedItemStoreUnitTest.php b/tests/phpunit/includes/WatchedItemStoreUnitTest.php
index d9fd4de151..9479a82864 100644
--- a/tests/phpunit/includes/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/includes/WatchedItemStoreUnitTest.php
@@ -2007,6 +2007,33 @@ class WatchedItemStoreUnitTest extends PHPUnit_Framework_TestCase {
 		return $title;
 	}
 
+	private function verifyCallbackJob(
+		$callback,
+		LinkTarget $expectedTitle,
+		$expectedUserId,
+		callable $notificationTimestampCondition
+	) {
+		$this->assertInternalType( 'callable', $callback );
+
+		$callbackReflector = new ReflectionFunction( $callback );
+		$vars = $callbackReflector->getStaticVariables();
+		$this->assertArrayHasKey( 'job', $vars );
+		$this->assertInstanceOf( ActivityUpdateJob::class, $vars['job'] );
+
+		/** @var ActivityUpdateJob $job */
+		$job = $vars['job'];
+		$this->assertEquals( $expectedTitle->getDBkey(), $job->getTitle()->getDBkey() );
+		$this->assertEquals( $expectedTitle->getNamespace(), $job->getTitle()->getNamespace() );
+
+		$jobParams = $job->getParams();
+		$this->assertArrayHasKey( 'type', $jobParams );
+		$this->assertEquals( 'updateWatchlistNotification', $jobParams['type'] );
+		$this->assertArrayHasKey( 'userid', $jobParams );
+		$this->assertEquals( $expectedUserId, $jobParams['userid'] );
+		$this->assertArrayHasKey( 'notifTime', $jobParams );
+		$this->assertTrue( $notificationTimestampCondition( $jobParams['notifTime'] ) );
+	}
+
 	public function testResetNotificationTimestamp_oldidSpecifiedLatestRevisionForced() {
 		$user = $this->getMockNonAnonUserWithId( 1 );
 		$oldid = 22;
@@ -2033,12 +2060,18 @@ class WatchedItemStoreUnitTest extends PHPUnit_Framework_TestCase {
 			$mockCache
 		);
 
-		// Note: This does not actually assert the job is correct
 		$callableCallCounter = 0;
 		$scopedOverride = $store->overrideDeferredUpdatesAddCallableUpdateCallback(
-			function( $callable ) use ( &$callableCallCounter ) {
+			function( $callable ) use ( &$callableCallCounter, $title, $user ) {
 				$callableCallCounter++;
-				$this->assertInternalType( 'callable', $callable );
+				$this->verifyCallbackJob(
+					$callable,
+					$title,
+					$user->getId(),
+					function( $time ) {
+						return $time === null;
+					}
+				);
 			}
 		);
 
@@ -2093,12 +2126,18 @@ class WatchedItemStoreUnitTest extends PHPUnit_Framework_TestCase {
 			$mockCache
 		);
 
-		// Note: This does not actually assert the job is correct
 		$addUpdateCallCounter = 0;
 		$scopedOverrideDeferred = $store->overrideDeferredUpdatesAddCallableUpdateCallback(
-			function( $callable ) use ( &$addUpdateCallCounter ) {
+			function( $callable ) use ( &$addUpdateCallCounter, $title, $user ) {
 				$addUpdateCallCounter++;
-				$this->assertInternalType( 'callable', $callable );
+				$this->verifyCallbackJob(
+					$callable,
+					$title,
+					$user->getId(),
+					function( $time ) {
+						return $time !== null && $time > '20151212010101';
+					}
+				);
 			}
 		);
 
@@ -2126,6 +2165,224 @@ class WatchedItemStoreUnitTest extends PHPUnit_Framework_TestCase {
 		ScopedCallback::consume( $scopedOverrideRevision );
 	}
 
+	public function testResetNotificationTimestamp_notWatchedPageForced() {
+		$user = $this->getMockNonAnonUserWithId( 1 );
+		$oldid = 22;
+		$title = $this->getMockTitle( 'SomeDbKey' );
+		$title->expects( $this->once() )
+			->method( 'getNextRevisionID' )
+			->with( $oldid )
+			->will( $this->returnValue( 33 ) );
+
+		$mockDb = $this->getMockDb();
+		$mockDb->expects( $this->once() )
+			->method( 'selectRow' )
+			->with(
+				'watchlist',
+				'wl_notificationtimestamp',
+				[
+					'wl_user' => 1,
+					'wl_namespace' => 0,
+					'wl_title' => 'SomeDbKey',
+				]
+			)
+			->will( $this->returnValue( false ) );
+
+		$mockCache = $this->getMockCache();
+		$mockDb->expects( $this->never() )
+			->method( 'get' );
+		$mockDb->expects( $this->never() )
+			->method( 'set' );
+		$mockDb->expects( $this->never() )
+			->method( 'delete' );
+
+		$store = $this->newWatchedItemStore(
+			$this->getMockLoadBalancer( $mockDb ),
+			$mockCache
+		);
+
+		$callableCallCounter = 0;
+		$scopedOverride = $store->overrideDeferredUpdatesAddCallableUpdateCallback(
+			function( $callable ) use ( &$callableCallCounter, $title, $user ) {
+				$callableCallCounter++;
+				$this->verifyCallbackJob(
+					$callable,
+					$title,
+					$user->getId(),
+					function( $time ) {
+						return $time === null;
+					}
+				);
+			}
+		);
+
+		$this->assertTrue(
+			$store->resetNotificationTimestamp(
+				$user,
+				$title,
+				'force',
+				$oldid
+			)
+		);
+		$this->assertEquals( 1, $callableCallCounter );
+
+		ScopedCallback::consume( $scopedOverride );
+	}
+
+	public function testResetNotificationTimestamp_futureNotificationTimestampForced() {
+		$user = $this->getMockNonAnonUserWithId( 1 );
+		$oldid = 22;
+		$title = $this->getMockTitle( 'SomeDbKey' );
+		$title->expects( $this->once() )
+			->method( 'getNextRevisionID' )
+			->with( $oldid )
+			->will( $this->returnValue( 33 ) );
+
+		$mockDb = $this->getMockDb();
+		$mockDb->expects( $this->once() )
+			->method( 'selectRow' )
+			->with(
+				'watchlist',
+				'wl_notificationtimestamp',
+				[
+					'wl_user' => 1,
+					'wl_namespace' => 0,
+					'wl_title' => 'SomeDbKey',
+				]
+			)
+			->will( $this->returnValue(
+				$this->getFakeRow( [ 'wl_notificationtimestamp' => '30151212010101' ] )
+			) );
+
+		$mockCache = $this->getMockCache();
+		$mockDb->expects( $this->never() )
+			->method( 'get' );
+		$mockDb->expects( $this->never() )
+			->method( 'set' );
+		$mockDb->expects( $this->never() )
+			->method( 'delete' );
+
+		$store = $this->newWatchedItemStore(
+			$this->getMockLoadBalancer( $mockDb ),
+			$mockCache
+		);
+
+		$addUpdateCallCounter = 0;
+		$scopedOverrideDeferred = $store->overrideDeferredUpdatesAddCallableUpdateCallback(
+			function( $callable ) use ( &$addUpdateCallCounter, $title, $user ) {
+				$addUpdateCallCounter++;
+				$this->verifyCallbackJob(
+					$callable,
+					$title,
+					$user->getId(),
+					function( $time ) {
+						return $time === '30151212010101';
+					}
+				);
+			}
+		);
+
+		$getTimestampCallCounter = 0;
+		$scopedOverrideRevision = $store->overrideRevisionGetTimestampFromIdCallback(
+			function( $titleParam, $oldidParam ) use ( &$getTimestampCallCounter, $title, $oldid ) {
+				$getTimestampCallCounter++;
+				$this->assertEquals( $title, $titleParam );
+				$this->assertEquals( $oldid, $oldidParam );
+			}
+		);
+
+		$this->assertTrue(
+			$store->resetNotificationTimestamp(
+				$user,
+				$title,
+				'force',
+				$oldid
+			)
+		);
+		$this->assertEquals( 1, $addUpdateCallCounter );
+		$this->assertEquals( 1, $getTimestampCallCounter );
+
+		ScopedCallback::consume( $scopedOverrideDeferred );
+		ScopedCallback::consume( $scopedOverrideRevision );
+	}
+
+	public function testResetNotificationTimestamp_futureNotificationTimestampNotForced() {
+		$user = $this->getMockNonAnonUserWithId( 1 );
+		$oldid = 22;
+		$title = $this->getMockTitle( 'SomeDbKey' );
+		$title->expects( $this->once() )
+			->method( 'getNextRevisionID' )
+			->with( $oldid )
+			->will( $this->returnValue( 33 ) );
+
+		$mockDb = $this->getMockDb();
+		$mockDb->expects( $this->once() )
+			->method( 'selectRow' )
+			->with(
+				'watchlist',
+				'wl_notificationtimestamp',
+				[
+					'wl_user' => 1,
+					'wl_namespace' => 0,
+					'wl_title' => 'SomeDbKey',
+				]
+			)
+			->will( $this->returnValue(
+				$this->getFakeRow( [ 'wl_notificationtimestamp' => '30151212010101' ] )
+			) );
+
+		$mockCache = $this->getMockCache();
+		$mockDb->expects( $this->never() )
+			->method( 'get' );
+		$mockDb->expects( $this->never() )
+			->method( 'set' );
+		$mockDb->expects( $this->never() )
+			->method( 'delete' );
+
+		$store = $this->newWatchedItemStore(
+			$this->getMockLoadBalancer( $mockDb ),
+			$mockCache
+		);
+
+		$addUpdateCallCounter = 0;
+		$scopedOverrideDeferred = $store->overrideDeferredUpdatesAddCallableUpdateCallback(
+			function( $callable ) use ( &$addUpdateCallCounter, $title, $user ) {
+				$addUpdateCallCounter++;
+				$this->verifyCallbackJob(
+					$callable,
+					$title,
+					$user->getId(),
+					function( $time ) {
+						return $time === false;
+					}
+				);
+			}
+		);
+
+		$getTimestampCallCounter = 0;
+		$scopedOverrideRevision = $store->overrideRevisionGetTimestampFromIdCallback(
+			function( $titleParam, $oldidParam ) use ( &$getTimestampCallCounter, $title, $oldid ) {
+				$getTimestampCallCounter++;
+				$this->assertEquals( $title, $titleParam );
+				$this->assertEquals( $oldid, $oldidParam );
+			}
+		);
+
+		$this->assertTrue(
+			$store->resetNotificationTimestamp(
+				$user,
+				$title,
+				'',
+				$oldid
+			)
+		);
+		$this->assertEquals( 1, $addUpdateCallCounter );
+		$this->assertEquals( 1, $getTimestampCallCounter );
+
+		ScopedCallback::consume( $scopedOverrideDeferred );
+		ScopedCallback::consume( $scopedOverrideRevision );
+	}
+
 	public function testUpdateNotificationTimestamp_watchersExist() {
 		$mockDb = $this->getMockDb();
 		$mockDb->expects( $this->once() )