Skip to content

Commit 8f16e36

Browse files
nishant04412nishant04412
committed
AC-10634: setMethods replaced with onlyMethods() or addMethods()
1 parent bfea788 commit 8f16e36

File tree

10 files changed

+154
-84
lines changed

10 files changed

+154
-84
lines changed

‎app/code/Magento/CatalogInventory/Test/Unit/Model/Spi/StockStateProviderTest.php

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,25 @@ class StockStateProviderTest extends TestCase
7878
/**
7979
* @var array
8080
*/
81-
protected $stockItemMethods = [
81+
protected $stockAddItemMethods = [
8282
'getId',
83-
'getProductId',
8483
'getWebsiteId',
84+
'hasStockQty',
85+
'setStockQty',
86+
'getData',
87+
'getSuppressCheckQtyIncrements',
88+
'getIsChildItem',
89+
'getIsSaleable',
90+
'getOrderedItems',
91+
'setOrderedItems',
92+
'getProductName'
93+
];
94+
95+
/**
96+
* @var array
97+
*/
98+
protected $stockItemMethods = [
99+
'getProductId',
85100
'getStockId',
86101
'getQty',
87102
'getIsInStock',
@@ -106,15 +121,6 @@ class StockStateProviderTest extends TestCase
106121
'getLowStockDate',
107122
'getIsDecimalDivided',
108123
'getStockStatusChangedAuto',
109-
'hasStockQty',
110-
'setStockQty',
111-
'getData',
112-
'getSuppressCheckQtyIncrements',
113-
'getIsChildItem',
114-
'getIsSaleable',
115-
'getOrderedItems',
116-
'setOrderedItems',
117-
'getProductName',
118124
];
119125

120126
/**
@@ -350,7 +356,8 @@ protected function prepareDataForMethod($methodName, array $options = null)
350356
foreach ($options as $variation) {
351357
$stockItem = $this->getMockBuilder(StockItemInterface::class)
352358
->disableOriginalConstructor()
353-
->setMethods($this->stockItemMethods)
359+
->addMethods($this->stockAddItemMethods)
360+
->onlyMethods($this->stockItemMethods)
354361
->getMockForAbstractClass();
355362
$stockItem->expects($this->any())->method('getSuppressCheckQtyIncrements')->willReturn(
356363
$variation['values']['_suppress_check_qty_increments_']
@@ -537,7 +544,8 @@ public function testCheckQtyIncrementsMsg($isChildItem, $expectedMsg)
537544
$qty = 1;
538545
$qtyIncrements = 5;
539546
$stockItem = $this->getMockBuilder(StockItemInterface::class)
540-
->setMethods($this->stockItemMethods)
547+
->addMethods($this->stockAddItemMethods)
548+
->onlyMethods($this->stockItemMethods)
541549
->getMockForAbstractClass();
542550
$stockItem->expects($this->any())->method('getSuppressCheckQtyIncrements')->willReturn(false);
543551
$stockItem->expects($this->any())->method('getQtyIncrements')->willReturn($qtyIncrements);
@@ -553,7 +561,7 @@ public function testCheckQtyIncrementsMsg($isChildItem, $expectedMsg)
553561
/**
554562
* @return array
555563
*/
556-
public function checkQtyIncrementsMsgDataProvider()
564+
public static function checkQtyIncrementsMsgDataProvider()
557565
{
558566
return [
559567
[true, 'You can buy Simple Product only in quantities of 5 at a time.'],

‎app/code/Magento/Directory/Test/Unit/Model/Config/Source/AllRegionTest.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ protected function setUp(): void
3636
$objectManagerHelper = new ObjectManager($this);
3737

3838
$countryCollectionFactory = $this->getMockBuilder(
39-
CollectionFactory::class
40-
)->setMethods(['create', '__wakeup', '__sleep'])->disableOriginalConstructor()
39+
CollectionFactory::class)
40+
->addMethods(['__wakeup', '__sleep'])
41+
->onlyMethods(['create'])
42+
->disableOriginalConstructor()
4143
->getMock();
4244

4345
$this->countryCollection = $this->getMockBuilder(
4446
Collection::class
45-
)->setMethods(['load', 'toOptionArray', '__wakeup', '__sleep'])
47+
)->onlyMethods(['load', 'toOptionArray', '__wakeup', '__sleep'])
4648
->disableOriginalConstructor()
4749
->getMock();
4850
$countryCollectionFactory->expects($this->once())
@@ -55,10 +57,12 @@ protected function setUp(): void
5557
$regionCollectionFactory = $this->getMockBuilder(
5658
\Magento\Directory\Model\ResourceModel\Region\CollectionFactory::class
5759
)->disableOriginalConstructor()
58-
->setMethods(['create', '__wakeup', '__sleep'])->getMock();
60+
->addMethods(['__wakeup', '__sleep'])
61+
->onlyMethods(['create'])
62+
->getMock();
5963
$this->regionCollection = $this->getMockBuilder(\Magento\Directory\Model\ResourceModel\Region\Collection::class)
6064
->disableOriginalConstructor()
61-
->setMethods(['load', 'getIterator', '__wakeup', '__sleep'])
65+
->onlyMethods(['load', 'getIterator', '__wakeup', '__sleep'])
6266
->getMock();
6367
$regionCollectionFactory->expects($this->once())
6468
->method('create')
@@ -214,7 +218,8 @@ private function generateRegion($countryId, $id, $defaultName)
214218
{
215219
$region = $this->getMockBuilder(Region::class)
216220
->disableOriginalConstructor()
217-
->setMethods(['getCountryId', 'getId', 'getDefaultName', '__wakeup', '__sleep'])
221+
->addMethods(['getCountryId','getDefaultName'])
222+
->onlyMethods(['getId', '__wakeup', '__sleep'])
218223
->getMock();
219224
$region->expects($this->once())
220225
->method('getCountryId')

‎app/code/Magento/Downloadable/Test/Unit/Model/Product/TypeHandler/LinkTest.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ protected function setUp(): void
5454
$objectManagerHelper = new ObjectManagerHelper($this);
5555
$this->linkFactory = $this->getMockBuilder(LinkFactory::class)
5656
->disableOriginalConstructor()
57-
->setMethods(['create'])
57+
->onlyMethods(['create'])
5858
->getMock();
5959
$this->linkResource = $this->getMockBuilder(\Magento\Downloadable\Model\ResourceModel\Link::class)
6060
->disableOriginalConstructor()
61-
->setMethods(['deleteItems'])
61+
->onlyMethods(['deleteItems'])
6262
->getMock();
6363
$this->metadataPoolMock = $this->getMockBuilder(MetadataPool::class)
6464
->disableOriginalConstructor()
@@ -229,22 +229,18 @@ private function createLinkkModel($product, array $modelData, $isUnlimited)
229229
{
230230
$link = $this->getMockBuilder(\Magento\Downloadable\Model\Link::class)
231231
->disableOriginalConstructor()
232-
->setMethods(
232+
->addMethods(['setProductId','setStoreId','setWebsiteId','setProductWebsiteIds','getIsUnlimited'])
233+
->onlyMethods(
233234
[
234235
'setData',
235236
'setLinkType',
236-
'setProductId',
237-
'setStoreId',
238-
'setWebsiteId',
239-
'setProductWebsiteIds',
240237
'setPrice',
241238
'setNumberOfDownloads',
242239
'setSampleUrl',
243240
'setSampleType',
244241
'setLinkFile',
245242
'setSampleFile',
246-
'save',
247-
'getIsUnlimited'
243+
'save'
248244
]
249245
)
250246
->getMock();
@@ -287,14 +283,18 @@ private function createProductMock($id, $storeId, $storeWebsiteId, array $websit
287283
{
288284
$product = $this->getMockBuilder(Product::class)
289285
->disableOriginalConstructor()
290-
->setMethods(
286+
->addMethods(
287+
[
288+
'getLinksPurchasedSeparately',
289+
'setIsCustomOptionChanged'
290+
]
291+
)
292+
->onlyMethods(
291293
[
292294
'getId',
293295
'getStoreId',
294296
'getStore',
295297
'getWebsiteIds',
296-
'getLinksPurchasedSeparately',
297-
'setIsCustomOptionChanged',
298298
'getData'
299299
]
300300
)
@@ -310,7 +310,7 @@ private function createProductMock($id, $storeId, $storeWebsiteId, array $websit
310310
->willReturn($websiteIds);
311311
$store = $this->getMockBuilder(Store::class)
312312
->disableOriginalConstructor()
313-
->setMethods(['getWebsiteId'])
313+
->onlyMethods(['getWebsiteId'])
314314
->getMock();
315315
$store->expects($this->any())
316316
->method('getWebsiteId')

‎app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ protected function getModel($mockedMethods = null)
280280
$this->storeInformation
281281
]
282282
)
283-
->setMethods($mockedMethods)
283+
->onlyMethods($mockedMethods)
284284
->getMock();
285285
}
286286

‎app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php

Lines changed: 55 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Magento\Indexer\Model\Config;
1919
use Magento\Indexer\Model\Processor\MakeSharedIndexValid;
2020
use PHPUnit\Framework\MockObject\MockObject;
21+
use Psr\Log\LoggerInterface;
2122
use Symfony\Component\Console\Tester\CommandTester;
2223

2324
/**
@@ -58,6 +59,11 @@ class IndexerReindexCommandTest extends AbstractIndexerCommandCommonSetup
5859
*/
5960
private $objectManagerHelper;
6061

62+
/**
63+
* @var LoggerInterface|MockObject
64+
*/
65+
private $loggerMock;
66+
6167
/**
6268
* Set up
6369
*/
@@ -74,6 +80,7 @@ protected function setUp(): void
7480
$this->dependencyInfoProviderMock = $this->objectManagerHelper->getObject(DependencyInfoProvider::class, [
7581
'config' => $this->configMock,
7682
]);
83+
$this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
7784
parent::setUp();
7885
}
7986

@@ -93,7 +100,13 @@ protected function getObjectManagerReturnValueMap()
93100
public function testGetOptions()
94101
{
95102
$this->stateMock->expects($this->never())->method('setAreaCode');
96-
$this->command = new IndexerReindexCommand($this->objectManagerFactory);
103+
$this->command = new IndexerReindexCommand(
104+
$this->objectManagerFactory,
105+
$this->indexerRegistryMock,
106+
$this->dependencyInfoProviderMock,
107+
$this->makeSharedValidMock,
108+
$this->loggerMock
109+
);
97110
$optionsList = $this->command->getInputList();
98111
$this->assertCount(1, $optionsList);
99112
$this->assertSame('index', $optionsList[0]->getName());
@@ -119,7 +132,13 @@ public function testExecuteAll()
119132
]
120133
);
121134
$this->indexerFactory->expects($this->never())->method('create');
122-
$this->command = new IndexerReindexCommand($this->objectManagerFactory);
135+
$this->command = new IndexerReindexCommand(
136+
$this->objectManagerFactory,
137+
$this->indexerRegistryMock,
138+
$this->dependencyInfoProviderMock,
139+
$this->makeSharedValidMock,
140+
$this->loggerMock
141+
);
123142
$commandTester = new CommandTester($this->command);
124143
$commandTester->execute([]);
125144
$actualValue = $commandTester->getDisplay();
@@ -162,7 +181,7 @@ public function testExecuteWithIndex(
162181
$indexer->method('getState')
163182
->willReturn(
164183
$this->getStateMock(
165-
['loadByIndexer', 'setStatus', 'save'],
184+
['loadByIndexer', 'setStatus'],
166185
$states[$indexer->getId()] ?? []
167186
)
168187
);
@@ -181,7 +200,7 @@ public function testExecuteWithIndex(
181200
->withConsecutive(...$executedSharedIndexers)
182201
->willReturn($emptyIndexer);
183202
$emptyIndexer->method('getState')
184-
->willReturn($this->getStateMock(['setStatus', 'save']));
203+
->willReturn($this->getStateMock(['setStatus']));
185204

186205
$this->makeSharedValidMock = $this->objectManagerHelper->getObject(MakeSharedIndexValid::class, [
187206
'config' => $this->configMock,
@@ -193,7 +212,8 @@ public function testExecuteWithIndex(
193212
$this->objectManagerFactory,
194213
$this->indexerRegistryMock,
195214
$this->dependencyInfoProviderMock,
196-
$this->makeSharedValidMock
215+
$this->makeSharedValidMock,
216+
$this->loggerMock
197217
);
198218

199219
$commandTester = new CommandTester($this->command);
@@ -249,7 +269,8 @@ private function getStateMock(array $methods = null, array $data = [])
249269
{
250270
/** @var MockObject|StateInterface $state */
251271
$state = $this->getMockBuilder(StateInterface::class)
252-
->setMethods($methods)
272+
->addMethods(['save'])
273+
->onlyMethods($methods)
253274
->disableOriginalConstructor()
254275
->getMockForAbstractClass();
255276
$state->method('getStatus')
@@ -261,7 +282,7 @@ private function getStateMock(array $methods = null, array $data = [])
261282
* @return array
262283
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
263284
*/
264-
public function executeWithIndexDataProvider()
285+
public static function executeWithIndexDataProvider()
265286
{
266287
return [
267288
'Without dependencies' => [
@@ -297,9 +318,9 @@ public function executeWithIndexDataProvider()
297318
],
298319
],
299320
'expected_reindex_all_calls' => [
300-
'indexer_1' => $this->once(),
301-
'indexer_2' => $this->never(),
302-
'indexer_3' => $this->never(),
321+
'indexer_1' => self::once(),
322+
'indexer_2' => self::never(),
323+
'indexer_3' => self::never(),
303324
],
304325
'executed_indexers' => ['indexer_1'],
305326
'executed_shared_indexers' => [],
@@ -355,11 +376,11 @@ public function executeWithIndexDataProvider()
355376
],
356377
],
357378
'expected_reindex_all_calls' => [
358-
'indexer_1' => $this->once(),
359-
'indexer_2' => $this->never(),
360-
'indexer_3' => $this->once(),
361-
'indexer_4' => $this->never(),
362-
'indexer_5' => $this->once(),
379+
'indexer_1' => self::once(),
380+
'indexer_2' => self::never(),
381+
'indexer_3' => self::once(),
382+
'indexer_4' => self::never(),
383+
'indexer_5' => self::once(),
363384
],
364385
'executed_indexers' => ['indexer_3', 'indexer_1', 'indexer_5'],
365386
'executed_shared_indexers' => [['indexer_2'], ['indexer_3']],
@@ -413,11 +434,11 @@ public function executeWithIndexDataProvider()
413434
],
414435
],
415436
'expected_reindex_all_calls' => [
416-
'indexer_1' => $this->once(),
417-
'indexer_2' => $this->never(),
418-
'indexer_3' => $this->once(),
419-
'indexer_4' => $this->once(),
420-
'indexer_5' => $this->once(),
437+
'indexer_1' => self::once(),
438+
'indexer_2' => self::never(),
439+
'indexer_3' => self::once(),
440+
'indexer_4' => self::once(),
441+
'indexer_5' => self::once(),
421442
],
422443
'executed_indexers' => ['indexer_1', 'indexer_4', 'indexer_3', 'indexer_5'],
423444
'executed_shared_indexers' => [],
@@ -436,7 +457,13 @@ public function testExecuteWithException()
436457
->method('reindexAll')
437458
->willThrowException(new \Exception());
438459
$this->initIndexerCollectionByItems([$indexerOne]);
439-
$this->command = new IndexerReindexCommand($this->objectManagerFactory);
460+
$this->command = new IndexerReindexCommand(
461+
$this->objectManagerFactory,
462+
$this->indexerRegistryMock,
463+
$this->dependencyInfoProviderMock,
464+
$this->makeSharedValidMock,
465+
$this->loggerMock
466+
);
440467
$commandTester = new CommandTester($this->command);
441468
$commandTester->execute(['index' => ['indexer_1']]);
442469
$actualValue = $commandTester->getDisplay();
@@ -478,7 +505,13 @@ function ($item) {
478505
)
479506
)
480507
);
481-
$this->command = new IndexerReindexCommand($this->objectManagerFactory);
508+
$this->command = new IndexerReindexCommand(
509+
$this->objectManagerFactory,
510+
$this->indexerRegistryMock,
511+
$this->dependencyInfoProviderMock,
512+
$this->makeSharedValidMock,
513+
$this->loggerMock
514+
);
482515
$commandTester = new CommandTester($this->command);
483516
$commandTester->execute(['index' => $inputIndexers]);
484517
$this->assertSame(Cli::RETURN_FAILURE, $commandTester->getStatusCode());

0 commit comments

Comments
 (0)