From bfe88fd8f98a766a965d73064ee0c648c65424bd Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 12 Apr 2018 13:18:39 -0700
Subject: [PATCH] Make WatchedItemStoreUnitTest compatible with PHPUnit 6

A few tests were mocking the wrong object due to a typo, so have those
mock the correct object, and update the tests to reflect reality.

Change-Id: Ifd1e4ae8a98124b9055ec4023382305f743f9b43
---
 .../watcheditem/WatchedItemStoreUnitTest.php  | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
index 948517067c..26f69088e9 100644
--- a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
@@ -47,6 +47,7 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
 	private function getMockCache() {
 		$mock = $this->getMockBuilder( HashBagOStuff::class )
 			->disableOriginalConstructor()
+			->setMethods( [ 'get', 'set', 'delete', 'makeKey' ] )
 			->getMock();
 		$mock->expects( $this->any() )
 			->method( 'makeKey' )
@@ -2074,12 +2075,11 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
 			->method( 'selectRow' );
 
 		$mockCache = $this->getMockCache();
-		$mockDb->expects( $this->never() )
-			->method( 'get' );
-		$mockDb->expects( $this->never() )
-			->method( 'set' );
-		$mockDb->expects( $this->never() )
-			->method( 'delete' );
+		$mockCache->expects( $this->never() )->method( 'get' );
+		$mockCache->expects( $this->never() )->method( 'set' );
+		$mockCache->expects( $this->once() )
+			->method( 'delete' )
+			->with( '0:SomeDbKey:1' );
 
 		$store = $this->newWatchedItemStore(
 			$this->getMockLoadBalancer( $mockDb ),
@@ -2168,12 +2168,11 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
 			->method( 'selectRow' );
 
 		$mockCache = $this->getMockCache();
-		$mockDb->expects( $this->never() )
-			->method( 'get' );
-		$mockDb->expects( $this->never() )
-			->method( 'set' );
-		$mockDb->expects( $this->never() )
-			->method( 'delete' );
+		$mockCache->expects( $this->never() )->method( 'get' );
+		$mockCache->expects( $this->never() )->method( 'set' );
+		$mockCache->expects( $this->once() )
+			->method( 'delete' )
+			->with( '0:SomeTitle:1' );
 
 		$store = $this->newWatchedItemStore(
 			$this->getMockLoadBalancer( $mockDb ),
@@ -2235,12 +2234,13 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
 			) );
 
 		$mockCache = $this->getMockCache();
-		$mockDb->expects( $this->never() )
-			->method( 'get' );
-		$mockDb->expects( $this->never() )
-			->method( 'set' );
-		$mockDb->expects( $this->never() )
-			->method( 'delete' );
+		$mockCache->expects( $this->never() )->method( 'get' );
+		$mockCache->expects( $this->once() )
+			->method( 'set' )
+			->with( '0:SomeDbKey:1', $this->isType( 'object' ) );
+		$mockCache->expects( $this->once() )
+			->method( 'delete' )
+			->with( '0:SomeDbKey:1' );
 
 		$store = $this->newWatchedItemStore(
 			$this->getMockLoadBalancer( $mockDb ),
@@ -2311,12 +2311,11 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
 			->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' );
+		$mockCache->expects( $this->never() )->method( 'get' );
+		$mockCache->expects( $this->never() )->method( 'set' );
+		$mockCache->expects( $this->once() )
+			->method( 'delete' )
+			->with( '0:SomeDbKey:1' );
 
 		$store = $this->newWatchedItemStore(
 			$this->getMockLoadBalancer( $mockDb ),
@@ -2378,12 +2377,13 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
 			) );
 
 		$mockCache = $this->getMockCache();
-		$mockDb->expects( $this->never() )
-			->method( 'get' );
-		$mockDb->expects( $this->never() )
-			->method( 'set' );
-		$mockDb->expects( $this->never() )
-			->method( 'delete' );
+		$mockCache->expects( $this->never() )->method( 'get' );
+		$mockCache->expects( $this->once() )
+			->method( 'set' )
+			->with( '0:SomeDbKey:1', $this->isType( 'object' ) );
+		$mockCache->expects( $this->once() )
+			->method( 'delete' )
+			->with( '0:SomeDbKey:1' );
 
 		$store = $this->newWatchedItemStore(
 			$this->getMockLoadBalancer( $mockDb ),
@@ -2456,12 +2456,13 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
 			) );
 
 		$mockCache = $this->getMockCache();
-		$mockDb->expects( $this->never() )
-			->method( 'get' );
-		$mockDb->expects( $this->never() )
-			->method( 'set' );
-		$mockDb->expects( $this->never() )
-			->method( 'delete' );
+		$mockCache->expects( $this->never() )->method( 'get' );
+		$mockCache->expects( $this->once() )
+			->method( 'set' )
+			->with( '0:SomeDbKey:1', $this->isType( 'object' ) );
+		$mockCache->expects( $this->once() )
+			->method( 'delete' )
+			->with( '0:SomeDbKey:1' );
 
 		$store = $this->newWatchedItemStore(
 			$this->getMockLoadBalancer( $mockDb ),
-- 
2.20.1