From 005dd91276b15578c3c07f9cea93e4aedaa17b86 Mon Sep 17 00:00:00 2001 From: Thiemo Kreuz Date: Wed, 5 Jun 2019 14:54:03 +0200 Subject: [PATCH] Replace very trivial mock builders with createMock() It does the exact same before and after. createMock() always disables the default constructor. Change-Id: I7b294cc3ee7f245f0aec55d12f1277fca5d39bce --- .../includes/Revision/FallbackSlotRoleHandlerTest.php | 10 ++++------ .../includes/Revision/RevisionStoreFactoryTest.php | 7 ++----- .../phpunit/includes/Revision/SlotRoleHandlerTest.php | 10 ++++------ .../phpunit/includes/Revision/SlotRoleRegistryTest.php | 10 ++++------ .../rdbms/connectionmanager/ConnectionManagerTest.php | 7 ++----- .../SessionConsistentConnectionManagerTest.php | 7 ++----- 6 files changed, 18 insertions(+), 33 deletions(-) diff --git a/tests/phpunit/includes/Revision/FallbackSlotRoleHandlerTest.php b/tests/phpunit/includes/Revision/FallbackSlotRoleHandlerTest.php index aedf292eca..898a35f23f 100644 --- a/tests/phpunit/includes/Revision/FallbackSlotRoleHandlerTest.php +++ b/tests/phpunit/includes/Revision/FallbackSlotRoleHandlerTest.php @@ -11,13 +11,11 @@ use Title; */ class FallbackSlotRoleHandlerTest extends MediaWikiTestCase { + /** + * @return Title + */ private function makeBlankTitleObject() { - /** @var Title $title */ - $title = $this->getMockBuilder( Title::class ) - ->disableOriginalConstructor() - ->getMock(); - - return $title; + return $this->createMock( Title::class ); } /** diff --git a/tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php b/tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php index 138d6bcba1..4f06ee24e3 100644 --- a/tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php +++ b/tests/phpunit/includes/Revision/RevisionStoreFactoryTest.php @@ -151,13 +151,10 @@ class RevisionStoreFactoryTest extends MediaWikiTestCase { } /** - * @return \PHPUnit_Framework_MockObject_MockObject|SlotRoleRegistry + * @return SlotRoleRegistry */ private function getMockSlotRoleRegistry() { - $mock = $this->getMockBuilder( SlotRoleRegistry::class ) - ->disableOriginalConstructor()->getMock(); - - return $mock; + return $this->createMock( SlotRoleRegistry::class ); } /** diff --git a/tests/phpunit/includes/Revision/SlotRoleHandlerTest.php b/tests/phpunit/includes/Revision/SlotRoleHandlerTest.php index 67e9464f33..372a879313 100644 --- a/tests/phpunit/includes/Revision/SlotRoleHandlerTest.php +++ b/tests/phpunit/includes/Revision/SlotRoleHandlerTest.php @@ -11,13 +11,11 @@ use Title; */ class SlotRoleHandlerTest extends MediaWikiTestCase { + /** + * @return Title + */ private function makeBlankTitleObject() { - /** @var Title $title */ - $title = $this->getMockBuilder( Title::class ) - ->disableOriginalConstructor() - ->getMock(); - - return $title; + return $this->createMock( Title::class ); } /** diff --git a/tests/phpunit/includes/Revision/SlotRoleRegistryTest.php b/tests/phpunit/includes/Revision/SlotRoleRegistryTest.php index 4d8030d519..c48a33a8af 100644 --- a/tests/phpunit/includes/Revision/SlotRoleRegistryTest.php +++ b/tests/phpunit/includes/Revision/SlotRoleRegistryTest.php @@ -17,13 +17,11 @@ use Wikimedia\Assert\PostconditionException; */ class SlotRoleRegistryTest extends MediaWikiTestCase { + /** + * @return Title + */ private function makeBlankTitleObject() { - /** @var Title $title */ - $title = $this->getMockBuilder( Title::class ) - ->disableOriginalConstructor() - ->getMock(); - - return $title; + return $this->createMock( Title::class ); } private function makeNameTableStore( array $names = [] ) { diff --git a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php index dd86a73eca..857f7090c9 100644 --- a/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php +++ b/tests/phpunit/includes/libs/rdbms/connectionmanager/ConnectionManagerTest.php @@ -13,6 +13,7 @@ use Wikimedia\Rdbms\ConnectionManager; * @author Daniel Kinzler */ class ConnectionManagerTest extends \PHPUnit\Framework\TestCase { + use \PHPUnit4And6Compat; /** * @return IDatabase|PHPUnit_Framework_MockObject_MockObject @@ -26,11 +27,7 @@ class ConnectionManagerTest extends \PHPUnit\Framework\TestCase { * @return LoadBalancer|PHPUnit_Framework_MockObject_MockObject */ private function getLoadBalancerMock() { - $lb = $this->getMockBuilder( LoadBalancer::class ) - ->disableOriginalConstructor() - ->getMock(); - - return $lb; + return $this->createMock( LoadBalancer::class ); } public function testGetReadConnection_nullGroups() { diff --git a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php index 8d7d104c1e..3492c3d9bb 100644 --- a/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php +++ b/tests/phpunit/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManagerTest.php @@ -13,6 +13,7 @@ use Wikimedia\Rdbms\SessionConsistentConnectionManager; * @author Daniel Kinzler */ class SessionConsistentConnectionManagerTest extends \PHPUnit\Framework\TestCase { + use \PHPUnit4And6Compat; /** * @return IDatabase|PHPUnit_Framework_MockObject_MockObject @@ -26,11 +27,7 @@ class SessionConsistentConnectionManagerTest extends \PHPUnit\Framework\TestCase * @return LoadBalancer|PHPUnit_Framework_MockObject_MockObject */ private function getLoadBalancerMock() { - $lb = $this->getMockBuilder( LoadBalancer::class ) - ->disableOriginalConstructor() - ->getMock(); - - return $lb; + return $this->createMock( LoadBalancer::class ); } public function testGetReadConnection() { -- 2.20.1