Skip to content

Commit d9560c7

Browse files
nishant04412nishant04412
committed
Merge remote-tracking branch 'origin/AC-10634-ce' into AC-10821
2 parents a569fd5 + 3f24986 commit d9560c7

File tree

74 files changed

+637
-425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+637
-425
lines changed

‎app/code/Magento/AdminNotification/Test/Unit/Block/Grid/Renderer/SeverityTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function testShouldRenderSeverity() : void
4646
/** @var Column|MockObject $columnMock */
4747
$columnMock = $this->getMockBuilder(Column::class)
4848
->disableOriginalConstructor()
49-
->setMethods(['getIndex'])
49+
->addMethods(['getIndex'])
5050
->getMock();
5151
$columnMock->expects($this->exactly(5))->method('getIndex')->willReturn('index');
5252
$this->sut->setColumn($columnMock);

‎app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,11 @@ protected function setUp(): void
5858
$this->objectManager = new ObjectManager($this);
5959
$this->connectionValidatorMock = $this->getMockBuilder(ConnectionValidator::class)
6060
->disableOriginalConstructor()
61-
->setMethods([])
6261
->getMock();
6362

6463
$this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
6564
->disableOriginalConstructor()
66-
->setMethods([])
65+
->onlyMethods([])
6766
->getMock();
6867

6968
$this->model = $this->objectManager->getObject(
@@ -171,7 +170,7 @@ public function testValidateNoOptions()
171170
/**
172171
* @return array
173172
*/
174-
public function getCreateConfigDataProvider()
173+
public static function getCreateConfigDataProvider()
175174
{
176175
return [
177176
[

‎app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ protected function setUp(): void
4949
$this->subscriptionStatusProviderMock = $this->createMock(SubscriptionStatusProvider::class);
5050
$this->contextMock = $this->createMock(Context::class);
5151
$this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
52-
->setMethods(['getComment', 'getElementHtml'])
52+
->addMethods(['getComment'])
53+
->onlyMethods(['getElementHtml'])
5354
->disableOriginalConstructor()
5455
->getMock();
5556

‎app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ class VerticalTest extends TestCase
4141
protected function setUp(): void
4242
{
4343
$this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
44-
->setMethods(['getComment', 'getLabel', 'getHint', 'getElementHtml'])
44+
->addMethods(['getComment', 'getLabel', 'getHint'])
45+
->onlyMethods(['getElementHtml'])
4546
->disableOriginalConstructor()
4647
->getMock();
4748

‎app/code/Magento/Analytics/Test/Unit/Model/Plugin/BaseUrlConfigPluginTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ protected function setUp(): void
4747
$this->subscriptionUpdateHandlerMock = $this->createMock(SubscriptionUpdateHandler::class);
4848
$this->configValueMock = $this->getMockBuilder(Value::class)
4949
->disableOriginalConstructor()
50-
->setMethods(['isValueChanged', 'getPath', 'getScope', 'getOldValue'])
50+
->addMethods(['getPath', 'getScope'])
51+
->onlyMethods(['isValueChanged', 'getOldValue'])
5152
->getMock();
5253
$this->objectManagerHelper = new ObjectManagerHelper($this);
5354
$this->plugin = $this->objectManagerHelper->getObject(
@@ -88,7 +89,7 @@ public function testAfterSavePluginIsNotApplicable(
8889
/**
8990
* @return array
9091
*/
91-
public function afterSavePluginIsNotApplicableDataProvider()
92+
public static function afterSavePluginIsNotApplicableDataProvider()
9293
{
9394
return [
9495
'Value has not been changed' => [

‎app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/Operation/CreateTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function testExecute()
8888
->method('getConnection')->with($connectionName)->willReturn($connection);
8989
$connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
9090
$operation = $this->getMockBuilder(OperationInterface::class)
91-
->setMethods(['getData'])
91+
->addMethods(['getData'])
9292
->disableOriginalConstructor()
9393
->getMockForAbstractClass();
9494
$operationList->expects($this->once())->method('getItems')->willReturn([$operation]);
@@ -123,7 +123,7 @@ public function testExecuteWithException()
123123
->method('getConnection')->with($connectionName)->willReturn($connection);
124124
$connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
125125
$operation = $this->getMockBuilder(OperationInterface::class)
126-
->setMethods(['getData'])
126+
->addMethods(['getData'])
127127
->disableOriginalConstructor()
128128
->getMockForAbstractClass();
129129
$operationList->expects($this->once())->method('getItems')->willReturn([$operation]);

‎app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ protected function setUp(): void
8989
{
9090
$this->contextMock = $this->getMockBuilder(Context::class)
9191
->disableOriginalConstructor()
92-
->setMethods(['getResources'])
92+
->onlyMethods(['getResources'])
9393
->getMock();
9494

9595
$this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
9696
->disableOriginalConstructor()
97-
->setMethods(['getConnection', 'getTableName'])
97+
->onlyMethods(['getConnection', 'getTableName'])
9898
->getMock();
9999

100100
$this->contextMock->expects($this->once())
@@ -103,7 +103,7 @@ protected function setUp(): void
103103

104104
$this->connectionMock = $this->getMockBuilder(AdapterInterface::class)
105105
->disableOriginalConstructor()
106-
->setMethods([])
106+
->onlyMethods([])
107107
->getMockForAbstractClass();
108108

109109
$this->resourceConnectionMock->expects($this->once())
@@ -117,30 +117,30 @@ protected function setUp(): void
117117

118118
$this->aclBuilderMock = $this->getMockBuilder(Builder::class)
119119
->disableOriginalConstructor()
120-
->setMethods(['getConfigCache'])
120+
->addMethods(['getConfigCache'])
121121
->getMock();
122122

123123
$this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
124124
->disableOriginalConstructor()
125-
->setMethods([])
125+
->onlyMethods([])
126126
->getMockForAbstractClass();
127127

128128
$this->rootResourceMock = $this->getMockBuilder(RootResource::class)
129129
->disableOriginalConstructor()
130-
->setMethods([])
130+
->onlyMethods([])
131131
->getMock();
132132

133133
$this->aclDataCacheMock = $this->getMockBuilder(CacheInterface::class)
134134
->disableOriginalConstructor()
135-
->setMethods([])
135+
->onlyMethods([])
136136
->getMockForAbstractClass();
137137

138138
$this->aclBuilderMock->method('getConfigCache')
139139
->willReturn($this->aclDataCacheMock);
140140

141141
$this->rulesModelMock = $this->getMockBuilder(RulesModel::class)
142142
->disableOriginalConstructor()
143-
->setMethods(['getRoleId'])
143+
->addMethods(['getRoleId'])
144144
->getMock();
145145

146146
$this->rulesModelMock->method('getRoleId')
@@ -189,7 +189,7 @@ public function testLocalizedExceptionOccurrence()
189189

190190
$exceptionPhrase = $this->getMockBuilder(Phrase::class)
191191
->disableOriginalConstructor()
192-
->setMethods(['render'])
192+
->onlyMethods(['render'])
193193
->getMock();
194194

195195
$exceptionPhrase->method('render')->willReturn('TestException');

‎app/code/Magento/Backend/Test/Unit/Block/Widget/FormTest.php

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99

1010
use Magento\Backend\Block\Template\Context;
1111
use Magento\Backend\Block\Widget\Form;
12+
use Magento\Backend\Block\Widget\Form\Element\ElementCreator;
1213
use Magento\Framework\Data\Form as DataForm;
14+
use Magento\Framework\Json\Helper\Data;
15+
use Magento\Framework\ObjectManagerInterface;
16+
use Magento\Framework\App\ObjectManager;
1317
use Magento\Framework\UrlInterface;
1418
use PHPUnit\Framework\MockObject\MockObject;
1519
use PHPUnit\Framework\TestCase;
@@ -28,19 +32,38 @@ class FormTest extends TestCase
2832
/** @var UrlInterface|MockObject */
2933
protected $urlBuilder;
3034

35+
/** @var Data */
36+
protected $jsonHelperMock;
37+
38+
/** @var ElementCreator */
39+
protected $creatorStub;
40+
3141
protected function setUp(): void
3242
{
3343
$this->prepareContext();
3444

3545
$this->dataForm = $this->getMockBuilder(\Magento\Framework\Data\Form::class)
3646
->disableOriginalConstructor()
37-
->setMethods([
47+
->addMethods([
3848
'setParent',
39-
'setBaseUrl',
40-
'addCustomAttribute',
49+
'setBaseUrl'
4150
])
51+
->onlyMethods(['addCustomAttribute'])
4252
->getMock();
4353

54+
$this->jsonHelperMock = $this->getMockBuilder(Data::class)
55+
->disableOriginalConstructor()
56+
->getMock();
57+
58+
/** @var ObjectManagerInterface|MockObject $objectManagerMock */
59+
$objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
60+
$objectManagerMock->expects($this->exactly(3))
61+
->method('get')
62+
->willReturn($this->jsonHelperMock);
63+
ObjectManager::setInstance($objectManagerMock);
64+
65+
$this->creatorStub = $this->createMock(ElementCreator::class);
66+
4467
$this->model = new Form(
4568
$this->context
4669
);

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DateTest.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,26 @@ protected function setUp(): void
6666
{
6767
$this->mathRandomMock = $this->getMockBuilder(Random::class)
6868
->disableOriginalConstructor()
69-
->setMethods(['getUniqueHash'])
69+
->onlyMethods(['getUniqueHash'])
7070
->getMock();
7171

7272
$this->localeResolverMock = $this->getMockBuilder(ResolverInterface::class)
7373
->disableOriginalConstructor()
74-
->setMethods([])
7574
->getMockForAbstractClass();
7675

7776
$this->dateTimeFormatterMock = $this
7877
->getMockBuilder(DateTimeFormatterInterface::class)
7978
->disableOriginalConstructor()
80-
->setMethods([])
8179
->getMockForAbstractClass();
8280

8381
$this->columnMock = $this->getMockBuilder(Column::class)
8482
->disableOriginalConstructor()
85-
->setMethods(['getTimezone', 'getHtmlId', 'getId'])
83+
->addMethods(['getTimezone'])
84+
->onlyMethods(['getHtmlId', 'getId'])
8685
->getMock();
8786

8887
$this->localeDateMock = $this->getMockBuilder(TimezoneInterface::class)
8988
->disableOriginalConstructor()
90-
->setMethods([])
9189
->getMockForAbstractClass();
9290

9391
$this->escaperMock = $this->getMockBuilder(Escaper::class)
@@ -111,7 +109,7 @@ protected function setUp(): void
111109

112110
$this->repositoryMock = $this->getMockBuilder(Repository::class)
113111
->disableOriginalConstructor()
114-
->setMethods(['getUrlWithParams'])
112+
->onlyMethods(['getUrlWithParams'])
115113
->getMock();
116114

117115
$this->contextMock->expects($this->once())

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/DatetimeTest.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,29 @@ protected function setUp(): void
6666
{
6767
$this->mathRandomMock = $this->getMockBuilder(Random::class)
6868
->disableOriginalConstructor()
69-
->setMethods(['getUniqueHash'])
69+
->onlyMethods(['getUniqueHash'])
7070
->getMock();
7171

7272
$this->localeResolverMock = $this->getMockBuilder(ResolverInterface::class)
7373
->disableOriginalConstructor()
74-
->setMethods([])
74+
->onlyMethods([])
7575
->getMockForAbstractClass();
7676

7777
$this->dateTimeFormatterMock = $this
7878
->getMockBuilder(DateTimeFormatterInterface::class)
7979
->disableOriginalConstructor()
80-
->setMethods([])
80+
->onlyMethods([])
8181
->getMockForAbstractClass();
8282

8383
$this->columnMock = $this->getMockBuilder(Column::class)
8484
->disableOriginalConstructor()
85-
->setMethods(['getTimezone', 'getHtmlId', 'getId', 'getFilterTime'])
85+
->addMethods(['getTimezone','getFilterTime'])
86+
->onlyMethods(['getHtmlId', 'getId'])
8687
->getMock();
8788

8889
$this->localeDateMock = $this->getMockBuilder(TimezoneInterface::class)
8990
->disableOriginalConstructor()
90-
->setMethods([])
91+
->onlyMethods([])
9192
->getMockForAbstractClass();
9293

9394
$this->escaperMock = $this->getMockBuilder(Escaper::class)
@@ -111,7 +112,7 @@ protected function setUp(): void
111112

112113
$this->repositoryMock = $this->getMockBuilder(Repository::class)
113114
->disableOriginalConstructor()
114-
->setMethods(['getUrlWithParams'])
115+
->onlyMethods(['getUrlWithParams'])
115116
->getMock();
116117

117118
$this->contextMock->expects($this->once())

0 commit comments

Comments
 (0)