From 0cf2b216bea5e7cb09a692e2e0e68c67e090ef88 Mon Sep 17 00:00:00 2001 From: ADmad Date: Thu, 23 Jul 2020 00:00:21 +0530 Subject: [PATCH] Update use of deprecated method. --- .../TestCase/Controller/Component/SearchComponentTest.php | 8 +++----- tests/TestCase/Model/Behavior/SearchBehaviorTest.php | 8 ++++---- tests/TestCase/Model/Filter/BaseTest.php | 2 +- tests/TestCase/Model/SearchTraitTest.php | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tests/TestCase/Controller/Component/SearchComponentTest.php b/tests/TestCase/Controller/Component/SearchComponentTest.php index 859c2838..779e12ae 100644 --- a/tests/TestCase/Controller/Component/SearchComponentTest.php +++ b/tests/TestCase/Controller/Component/SearchComponentTest.php @@ -4,6 +4,7 @@ namespace Search\Test\TestCase\Controller\Component; use Cake\Controller\Controller; +use Cake\Http\Response; use Cake\Http\ServerRequest; use Cake\ORM\Table; use Cake\Routing\RouteBuilder; @@ -47,10 +48,7 @@ public function setUp(): void $routes->fallbacks(); }); $request = new ServerRequest(); - $response = $this - ->getMockBuilder('Cake\Http\Response') - ->setMethods(['stop']) - ->getMock(); + $response = new Response(); $this->Controller = new Controller($request, $response); $this->Search = new SearchComponent($this->Controller->components()); @@ -278,7 +276,7 @@ public function testIsSearchTrue() ]) ); $this->Controller->modelClass = 'SomePlugin.Articles'; - $this->Controller->Articles = $this->getMockBuilder(Table::class)->setMethods(['isSearch'])->getMock(); + $this->Controller->Articles = $this->getMockBuilder(Table::class)->addMethods(['isSearch'])->getMock(); $this->Controller->Articles->addBehavior('Search.Search'); $this->Controller->Articles->expects($this->once())->method('isSearch')->willReturn(true); diff --git a/tests/TestCase/Model/Behavior/SearchBehaviorTest.php b/tests/TestCase/Model/Behavior/SearchBehaviorTest.php index c74a25aa..572598a1 100644 --- a/tests/TestCase/Model/Behavior/SearchBehaviorTest.php +++ b/tests/TestCase/Model/Behavior/SearchBehaviorTest.php @@ -70,7 +70,7 @@ public function testProcessFilters() $behavior = $this ->getMockBuilder('Search\Model\Behavior\SearchBehavior') ->setConstructorArgs([$this->Comments]) - ->setMethods(['_getFilters']) + ->onlyMethods(['_getFilters']) ->getMock(); $this->Comments->behaviors()->reset(); $this->Comments->addBehavior('Search', [ @@ -93,7 +93,7 @@ public function testProcessFilters() $filter = $this ->getMockBuilder('\Search\Test\TestApp\Model\Filter\TestFilter') ->setConstructorArgs(['name', $manager]) - ->setMethods(['setArgs', 'skip', 'process', 'setQuery']) + ->onlyMethods(['setArgs', 'skip', 'process', 'setQuery']) ->getMock(); $filter ->expects($this->once()) @@ -115,7 +115,7 @@ public function testProcessFilters() $filter2 = $this ->getMockBuilder('\Search\Test\TestApp\Model\Filter\TestFilter') ->setConstructorArgs(['name', $manager, ['flatten' => false]]) - ->setMethods(['setArgs', 'skip', 'process', 'setQuery']) + ->onlyMethods(['setArgs', 'skip', 'process', 'setQuery']) ->getMock(); $filter2 ->expects($this->once()) @@ -137,7 +137,7 @@ public function testProcessFilters() $filter3 = $this ->getMockBuilder('\Search\Test\TestApp\Model\Filter\TestFilter') ->setConstructorArgs(['name', $manager]) - ->setMethods(['setArgs', 'skip', 'process', 'setQuery']) + ->onlyMethods(['setArgs', 'skip', 'process', 'setQuery']) ->getMock(); $filter3 ->expects($this->once()) diff --git a/tests/TestCase/Model/Filter/BaseTest.php b/tests/TestCase/Model/Filter/BaseTest.php index 4aa4fd06..ffdfa294 100644 --- a/tests/TestCase/Model/Filter/BaseTest.php +++ b/tests/TestCase/Model/Filter/BaseTest.php @@ -278,7 +278,7 @@ public function testBeforeProcessCallback() public function testBeforeProcessReturnFalse() { $filter = $this->getMockBuilder(TestFilter::class) - ->setMethods(['process']) + ->onlyMethods(['process']) ->setConstructorArgs([ 'fields', $this->Manager, diff --git a/tests/TestCase/Model/SearchTraitTest.php b/tests/TestCase/Model/SearchTraitTest.php index 25316008..e6694702 100644 --- a/tests/TestCase/Model/SearchTraitTest.php +++ b/tests/TestCase/Model/SearchTraitTest.php @@ -45,7 +45,7 @@ public function setUp(): void 'driver' => $driverMock, ], ]) - ->setMethods(['getWebservice']) + ->addMethods(['getWebservice']) ->getMock(); $connectionMock ->method('getWebservice')