From a78251721b81b5d3e3fbc21d0a358363b2da618f Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Wed, 1 May 2019 17:38:04 +0200 Subject: [PATCH] Mock IDatabase::class instead of DatabaseMysqli::class Change-Id: I4c15c32b17e1e5a70ad59b25f976a2fc0e7907fe --- tests/phpunit/includes/db/LBFactoryTest.php | 7 +++---- .../includes/filerepo/FileBackendDBRepoWrapperTest.php | 2 +- .../includes/filerepo/MigrateFileRepoLayoutTest.php | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php index b79cdf3896..106a13bc77 100644 --- a/tests/phpunit/includes/db/LBFactoryTest.php +++ b/tests/phpunit/includes/db/LBFactoryTest.php @@ -30,7 +30,6 @@ use Wikimedia\Rdbms\LBFactorySimple; use Wikimedia\Rdbms\LBFactoryMulti; use Wikimedia\Rdbms\LoadBalancer; use Wikimedia\Rdbms\ChronologyProtector; -use Wikimedia\Rdbms\DatabaseMysqli; use Wikimedia\Rdbms\MySQLMasterPos; use Wikimedia\Rdbms\DatabaseDomain; @@ -47,7 +46,7 @@ class LBFactoryTest extends MediaWikiTestCase { * @dataProvider getLBFactoryClassProvider */ public function testGetLBFactoryClass( $expected, $deprecated ) { - $mockDB = $this->getMockBuilder( DatabaseMysqli::class ) + $mockDB = $this->getMockBuilder( IDatabase::class ) ->disableOriginalConstructor() ->getMock(); @@ -291,7 +290,7 @@ class LBFactoryTest extends MediaWikiTestCase { $m2Pos = new MySQLMasterPos( 'db1064-bin.002400/794074907', $now ); // Master DB 1 - $mockDB1 = $this->getMockBuilder( DatabaseMysqli::class ) + $mockDB1 = $this->getMockBuilder( IDatabase::class ) ->disableOriginalConstructor() ->getMock(); $mockDB1->method( 'writesOrCallbacksPending' )->willReturn( true ); @@ -316,7 +315,7 @@ class LBFactoryTest extends MediaWikiTestCase { $lb1->method( 'getMasterPos' )->willReturn( $m1Pos ); $lb1->method( 'getServerName' )->with( 0 )->willReturn( 'master1' ); // Master DB 2 - $mockDB2 = $this->getMockBuilder( DatabaseMysqli::class ) + $mockDB2 = $this->getMockBuilder( IDatabase::class ) ->disableOriginalConstructor() ->getMock(); $mockDB2->method( 'writesOrCallbacksPending' )->willReturn( true ); diff --git a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php index 4c9855b074..346be7afa3 100644 --- a/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php +++ b/tests/phpunit/includes/filerepo/FileBackendDBRepoWrapperTest.php @@ -112,7 +112,7 @@ class FileBackendDBRepoWrapperTest extends MediaWikiTestCase { } protected function getMocks() { - $dbMock = $this->getMockBuilder( Wikimedia\Rdbms\DatabaseMysqli::class ) + $dbMock = $this->getMockBuilder( Wikimedia\Rdbms\IDatabase::class ) ->disableOriginalClone() ->disableOriginalConstructor() ->getMock(); diff --git a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php index 9beea5b630..0c78c2bd86 100644 --- a/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php +++ b/tests/phpunit/includes/filerepo/MigrateFileRepoLayoutTest.php @@ -28,7 +28,7 @@ class MigrateFileRepoLayoutTest extends MediaWikiTestCase { ] ] ); - $dbMock = $this->getMockBuilder( Wikimedia\Rdbms\DatabaseMysqli::class ) + $dbMock = $this->getMockBuilder( Wikimedia\Rdbms\IDatabase::class ) ->disableOriginalConstructor() ->getMock(); -- 2.20.1