From 4d380a4aa42dbaeb24f11163f0ee843dcc8358ae Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Mon, 9 Jan 2017 23:23:29 +0700 Subject: [PATCH] Fixed tests for PHPUnit 5.7 --- .../Command/CreateAdminCommandTest.php | 2 +- .../Command/CreateBuildCommandTest.php | 2 +- tests/PHPCensor/Plugin/EmailTest.php | 66 ++++++++----------- tests/PHPCensor/Plugin/Util/FactoryTest.php | 22 +++---- tests/PHPCensor/Service/BuildServiceTest.php | 4 +- .../Service/BuiltStatusServiceTest.php | 5 +- .../PHPCensor/Service/ProjectServiceTest.php | 4 +- tests/PHPCensor/Service/UserServiceTest.php | 2 +- 8 files changed, 46 insertions(+), 61 deletions(-) diff --git a/tests/PHPCensor/Command/CreateAdminCommandTest.php b/tests/PHPCensor/Command/CreateAdminCommandTest.php index 33361218..65fd2a8a 100644 --- a/tests/PHPCensor/Command/CreateAdminCommandTest.php +++ b/tests/PHPCensor/Command/CreateAdminCommandTest.php @@ -36,7 +36,7 @@ class CreateAdminCommandTest extends \PHPUnit_Framework_TestCase { parent::setUp(); - $userStoreMock = $this->getMock('PHPCensor\\Store\\UserStore'); + $userStoreMock = $this->getMockBuilder('PHPCensor\\Store\\UserStore')->getMock(); $this->command = new CreateAdminCommand($userStoreMock); diff --git a/tests/PHPCensor/Command/CreateBuildCommandTest.php b/tests/PHPCensor/Command/CreateBuildCommandTest.php index 82bbb37f..97196ede 100644 --- a/tests/PHPCensor/Command/CreateBuildCommandTest.php +++ b/tests/PHPCensor/Command/CreateBuildCommandTest.php @@ -29,7 +29,7 @@ class CreateBuildCommandTest extends \PHPUnit_Framework_TestCase { parent::setUp(); - $projectMock = $this->getMock('PHPCensor\\Model\\Project'); + $projectMock = $this->getMockBuilder('PHPCensor\\Model\\Project')->getMock(); $projectStoreMock = $this->getMockBuilder('PHPCensor\\Store\\ProjectStore') ->getMock(); diff --git a/tests/PHPCensor/Plugin/EmailTest.php b/tests/PHPCensor/Plugin/EmailTest.php index 0d61b014..1af168cb 100644 --- a/tests/PHPCensor/Plugin/EmailTest.php +++ b/tests/PHPCensor/Plugin/EmailTest.php @@ -27,9 +27,9 @@ class EmailTest extends \PHPUnit_Framework_TestCase protected $testedEmailPlugin; /** - * @var \PHPUnit_Framework_MockObject_MockObject $mockCiBuilder + * @var \PHPUnit_Framework_MockObject_MockObject $mockBuilder */ - protected $mockCiBuilder; + protected $mockBuilder; /** * @var \PHPUnit_Framework_MockObject_MockObject $mockBuild @@ -70,25 +70,23 @@ class EmailTest extends \PHPUnit_Framework_TestCase ] ]); - $this->mockProject = $this->getMock( - '\PHPCensor\Model\Project', - ['getTitle'], - [], - "mockProject", - false - ); + $this->mockProject = $this + ->getMockBuilder('\PHPCensor\Model\Project') + ->setMethods(['getTitle']) + ->setMockClassName('mockProject') + ->disableOriginalConstructor() + ->getMock(); $this->mockProject->expects($this->any()) ->method('getTitle') ->will($this->returnValue("Test-Project")); - $this->mockBuild = $this->getMock( - '\PHPCensor\Model\Build', - ['getLog', 'getStatus', 'getProject', 'getCommitterEmail'], - [], - "mockBuild", - false - ); + $this->mockBuild = $this + ->getMockBuilder('\PHPCensor\Model\Build') + ->setMethods(['getLog', 'getStatus', 'getProject', 'getCommitterEmail']) + ->setMockClassName('mockBuild') + ->disableOriginalConstructor() + ->getMock(); $this->mockBuild->expects($this->any()) ->method('getLog') @@ -108,22 +106,16 @@ class EmailTest extends \PHPUnit_Framework_TestCase ->method('getCommitterEmail') ->will($this->returnValue('committer-email@example.com')); - $this->mockCiBuilder = $this->getMock( - '\PHPCensor\Builder', - [ - 'getSystemConfig', - 'getBuild', - 'log', - 'logDebug' - ], - [], - "mockBuilder_email", - false - ); + $this->mockBuilder = $this + ->getMockBuilder('\PHPCensor\Builder') + ->setMethods(['getSystemConfig', 'getBuild', 'log', 'logDebug']) + ->setMockClassName('mockBuilder_email') + ->disableOriginalConstructor() + ->getMock(); - $this->mockCiBuilder->buildPath = "/"; + $this->mockBuilder->buildPath = "/"; - $this->mockCiBuilder->expects($this->any()) + $this->mockBuilder->expects($this->any()) ->method('getSystemConfig') ->with('php-censor') ->will($this->returnValue(['email_settings' => ['from_address' => "test-from-address@example.com"]])); @@ -144,15 +136,11 @@ class EmailTest extends \PHPUnit_Framework_TestCase $self = $this; - $this->testedEmailPlugin = $this->getMock( - '\PHPCensor\Plugin\Email', - ['sendEmail'], - [ - $this->mockCiBuilder, - $this->mockBuild, - $arrOptions - ] - ); + $this->testedEmailPlugin = $this + ->getMockBuilder('\PHPCensor\Plugin\Email') + ->setMethods(['sendEmail']) + ->setConstructorArgs([$this->mockBuilder, $this->mockBuild, $arrOptions]) + ->getMock(); $this->testedEmailPlugin->expects($this->any()) ->method('sendEmail') diff --git a/tests/PHPCensor/Plugin/Util/FactoryTest.php b/tests/PHPCensor/Plugin/Util/FactoryTest.php index 2f096702..87682a55 100644 --- a/tests/PHPCensor/Plugin/Util/FactoryTest.php +++ b/tests/PHPCensor/Plugin/Util/FactoryTest.php @@ -168,13 +168,10 @@ class FactoryTest extends \PHPUnit_Framework_TestCase { $this->testedFactory->registerResource( function () use ($self) { - return $self->getMock( - 'PHPCensor\Builder', - [], - [], - '', - false - ); + return $self + ->getMockBuilder('PHPCensor\Builder') + ->disableOriginalConstructor() + ->getMock(); }, null, 'PHPCensor\\Builder' @@ -182,13 +179,10 @@ class FactoryTest extends \PHPUnit_Framework_TestCase { $this->testedFactory->registerResource( function () use ($self) { - return $self->getMock( - 'PHPCensor\Model\Build', - [], - [], - '', - false - ); + return $self + ->getMockBuilder('PHPCensor\Model\Build') + ->disableOriginalConstructor() + ->getMock(); }, null, 'PHPCensor\\Model\\Build' diff --git a/tests/PHPCensor/Service/BuildServiceTest.php b/tests/PHPCensor/Service/BuildServiceTest.php index 66bc9cb8..46f721c4 100644 --- a/tests/PHPCensor/Service/BuildServiceTest.php +++ b/tests/PHPCensor/Service/BuildServiceTest.php @@ -33,7 +33,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase public function setUp() { - $this->mockBuildStore = $this->getMock('PHPCensor\Store\BuildStore'); + $this->mockBuildStore = $this->getMockBuilder('PHPCensor\Store\BuildStore')->getMock(); $this->mockBuildStore->expects($this->any()) ->method('save') ->will($this->returnArgument(0)); @@ -121,7 +121,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase public function testExecute_DeleteBuild() { - $store = $this->getMock('PHPCensor\Store\BuildStore'); + $store = $this->getMockBuilder('PHPCensor\Store\BuildStore')->getMock(); $store->expects($this->once()) ->method('delete') ->will($this->returnValue(true)); diff --git a/tests/PHPCensor/Service/BuiltStatusServiceTest.php b/tests/PHPCensor/Service/BuiltStatusServiceTest.php index 511bf4c8..7a31c6f1 100644 --- a/tests/PHPCensor/Service/BuiltStatusServiceTest.php +++ b/tests/PHPCensor/Service/BuiltStatusServiceTest.php @@ -112,7 +112,10 @@ class BuildStatusServiceTest extends \PHPUnit_Framework_TestCase */ protected function getProjectMock($prevBuildId = null, $setProject = true) { - $project = $this->getMock('PHPCensor\Model\Project', ['getLatestBuild']); + $project = $this + ->getMockBuilder('PHPCensor\Model\Project') + ->setMethods(['getLatestBuild']) + ->getMock(); $prevBuild = ($prevBuildId) ? $this->getBuild($prevBuildId, false) : null; diff --git a/tests/PHPCensor/Service/ProjectServiceTest.php b/tests/PHPCensor/Service/ProjectServiceTest.php index 314ff95b..83cfee10 100644 --- a/tests/PHPCensor/Service/ProjectServiceTest.php +++ b/tests/PHPCensor/Service/ProjectServiceTest.php @@ -33,7 +33,7 @@ class ProjectServiceTest extends \PHPUnit_Framework_TestCase public function setUp() { - $this->mockProjectStore = $this->getMock('PHPCensor\Store\ProjectStore'); + $this->mockProjectStore = $this->getMockBuilder('PHPCensor\Store\ProjectStore')->getMock(); $this->mockProjectStore->expects($this->any()) ->method('save') ->will($this->returnArgument(0)); @@ -115,7 +115,7 @@ class ProjectServiceTest extends \PHPUnit_Framework_TestCase public function testExecute_DeleteProject() { - $store = $this->getMock('PHPCensor\Store\ProjectStore'); + $store = $this->getMockBuilder('PHPCensor\Store\ProjectStore')->getMock(); $store->expects($this->once()) ->method('delete') ->will($this->returnValue(true)); diff --git a/tests/PHPCensor/Service/UserServiceTest.php b/tests/PHPCensor/Service/UserServiceTest.php index 4051933c..6e18e2db 100644 --- a/tests/PHPCensor/Service/UserServiceTest.php +++ b/tests/PHPCensor/Service/UserServiceTest.php @@ -32,7 +32,7 @@ class UserServiceTest extends \PHPUnit_Framework_TestCase public function setUp() { - $this->mockUserStore = $this->getMock('PHPCensor\Store\UserStore'); + $this->mockUserStore = $this->getMockBuilder('PHPCensor\Store\UserStore')->getMock(); $this->mockUserStore->expects($this->any()) ->method('save') ->will($this->returnArgument(0));