Skip to content

Commit 45ce184

Browse files
author
Maksym Savich
committed
MAGETWO-36484: Unit test code coverage in MLS10
- CR fixes
1 parent 0756f41 commit 45ce184

File tree

5 files changed

+84
-124
lines changed

5 files changed

+84
-124
lines changed

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,11 @@ class FileTest extends \PHPUnit_Framework_TestCase
1818

1919
protected function setUp()
2020
{
21-
$factoryMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Factory')
22-
->disableOriginalConstructor()
23-
->getMock();
24-
25-
$collectionFactoryMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\CollectionFactory')
26-
->disableOriginalConstructor()
27-
->getMock();
28-
29-
$escaperMock = $this->getMockBuilder('Magento\Framework\Escaper')
30-
->disableOriginalConstructor()
31-
->getMock();
32-
3321
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
3422

3523
$this->file = $objectManager->getObject(
3624
'Magento\Config\Block\System\Config\Form\Field\File',
3725
[
38-
'factoryElement' => $factoryMock,
39-
'factoryCollection' => $collectionFactoryMock,
40-
'escaper' => $escaperMock,
4126
'data' =>
4227
[
4328
'before_element_html' => 'test_before_element_html',

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,23 @@ class ImageTest extends \PHPUnit_Framework_TestCase
2121
/**
2222
* @var \Magento\Config\Block\System\Config\Form\Field\Image
2323
*/
24-
protected $_image;
24+
protected $image;
2525

2626
protected function setUp()
2727
{
28-
$factoryMock = $this->getMock('Magento\Framework\Data\Form\Element\Factory', [], [], '', false);
29-
$collectionFactoryMock = $this->getMock(
30-
'Magento\Framework\Data\Form\Element\CollectionFactory',
31-
[],
32-
[],
33-
'',
34-
false
35-
);
36-
$escaperMock = $this->getMock('Magento\Framework\Escaper', [], [], '', false);
28+
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
3729
$this->urlBuilderMock = $this->getMock('Magento\Framework\Url', [], [], '', false);
38-
$this->_image = new \Magento\Config\Block\System\Config\Form\Field\Image(
39-
$factoryMock,
40-
$collectionFactoryMock,
41-
$escaperMock,
42-
$this->urlBuilderMock
30+
$this->image = $objectManager->getObject(
31+
'Magento\Config\Block\System\Config\Form\Field\Image',
32+
[
33+
'urlBuilder' => $this->urlBuilderMock,
34+
]
4335
);
36+
4437
$formMock = new \Magento\Framework\Object();
4538
$formMock->getHtmlIdPrefix('id_prefix');
4639
$formMock->getHtmlIdPrefix('id_suffix');
47-
$this->_image->setForm($formMock);
40+
$this->image->setForm($formMock);
4841
}
4942

5043
/**
@@ -57,8 +50,8 @@ public function testGetElementHtmlWithValue()
5750
$this->urlBuilderMock->expects($this->once())->method('getBaseUrl')
5851
->with(['_type' => $type])->will($this->returnValue($url));
5952

60-
$this->_image->setValue('test_value');
61-
$this->_image->setFieldConfig(
53+
$this->image->setValue('test_value');
54+
$this->image->setFieldConfig(
6255
[
6356
'id' => 'placeholder',
6457
'type' => 'image',
@@ -82,7 +75,7 @@ public function testGetElementHtmlWithValue()
8275
'path' => 'catalog/placeholder',
8376
]);
8477

85-
$html = $this->_image->getElementHtml();
78+
$html = $this->image->getElementHtml();
8679
$this->assertContains('class="input-file"', $html);
8780
$this->assertContains('<input', $html);
8881
$this->assertContains('type="file"', $html);

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/NotificationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class NotificationTest extends \PHPUnit_Framework_TestCase
1313
{
1414
public function testRender()
1515
{
16-
$testCacheValue = time();
16+
$testCacheValue = '1433259723';
1717
$testDatetime = (new \DateTime(null, new \DateTimeZone('UTC')))->setTimestamp($testCacheValue);
1818
$formattedDate = (\IntlDateFormatter::formatObject($testDatetime));
1919
$htmlId = 'test_HTML_id';

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/RegexceptionsTest.php

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -44,33 +44,37 @@ class RegexceptionsTest extends \PHPUnit_Framework_TestCase
4444
protected function setUp()
4545
{
4646
$this->cellParameters = [
47-
'label' => 'testLabel',
4847
'size' => 'testSize',
4948
'style' => 'testStyle',
5049
'class' => 'testClass',
5150
];
5251

53-
$helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
52+
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
53+
54+
$this->labelFactoryMock = $this->getMockBuilder('Magento\Framework\View\Design\Theme\LabelFactory')
55+
->disableOriginalConstructor()
56+
->getMock();
57+
$this->labelMock = $this->getMockBuilder('Magento\Framework\View\Design\Theme\Label')
58+
->disableOriginalConstructor()
59+
->getMock();
60+
$this->elementFactoryMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Factory')
61+
->disableOriginalConstructor()
62+
->getMock();
63+
$this->elementMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\AbstractElement')
64+
->disableOriginalConstructor()
65+
->setMethods(
66+
['setForm', 'setName', 'setHtmlId', 'setValues', 'getName', 'getHtmlId', 'getValues', 'getElementHtml']
67+
)
68+
->getMock();
5469

55-
$this->labelFactoryMock = $this->getMock('Magento\Framework\View\Design\Theme\LabelFactory', [], [], '', false);
56-
$this->labelMock = $this->getMock('Magento\Framework\View\Design\Theme\Label', [], [], '', false);
57-
58-
$this->elementFactoryMock = $this->getMock('Magento\Framework\Data\Form\Element\Factory', [], [], '', false);
59-
$this->elementMock = $this->getMock(
60-
'Magento\Framework\Data\Form\Element\AbstractElement',
61-
['setForm', 'setName', 'setHtmlId', 'setValues', 'getName', 'getHtmlId', 'getValues', 'getElementHtml'],
62-
[],
63-
'',
64-
false
65-
);
6670
$data = [
6771
'elementFactory' => $this->elementFactoryMock,
6872
'labelFactory' => $this->labelFactoryMock,
6973
'data' => [
7074
'element' => $this->elementMock
7175
],
7276
];
73-
$this->object = $helper->getObject('Magento\Config\Block\System\Config\Form\Field\Regexceptions', $data);
77+
$this->object = $objectManager->getObject('Magento\Config\Block\System\Config\Form\Field\Regexceptions', $data);
7478
}
7579

7680
public function testRenderCellTemplateValueColumn()
@@ -79,10 +83,10 @@ public function testRenderCellTemplateValueColumn()
7983
$expectedResult = 'testValueElementHtml';
8084

8185
$this->elementFactoryMock->expects($this->once())->method('create')->willReturn($this->elementMock);
82-
$this->elementMock->expects($this->once())->method('setForm')->willReturn($this->elementMock);
83-
$this->elementMock->expects($this->once())->method('setName')->willReturn($this->elementMock);
84-
$this->elementMock->expects($this->once())->method('setHtmlId')->willReturn($this->elementMock);
85-
$this->elementMock->expects($this->once())->method('setValues')->willReturn($this->elementMock);
86+
$this->elementMock->expects($this->once())->method('setForm')->willReturnSelf();
87+
$this->elementMock->expects($this->once())->method('setName')->willReturnSelf();
88+
$this->elementMock->expects($this->once())->method('setHtmlId')->willReturnSelf();
89+
$this->elementMock->expects($this->once())->method('setValues')->willReturnSelf();
8690
$this->elementMock->expects($this->once())->method('getElementHtml')->willReturn($expectedResult);
8791

8892
$this->labelFactoryMock->expects($this->once())->method('create')->willReturn($this->labelMock);
@@ -102,28 +106,24 @@ public function testRenderCellTemplateValueColumn()
102106
public function testRenderCellTemplateOtherColumn()
103107
{
104108
$columnName = 'testCellName';
105-
$expectedResult = '<input type="text" id="<%- _id %>_testCellName" name="[<%- _id %>][testCellName]"' .
106-
' value="<%- testCellName %>" size="testSize" class="testClass" style="testStyle"/>';
107109

108110
$this->object->addColumn(
109111
$columnName,
110112
$this->cellParameters
111113
);
112114

113-
$this->assertEquals(
114-
$expectedResult,
115-
$this->object->renderCellTemplate($columnName)
116-
);
115+
$actual = $this->object->renderCellTemplate($columnName);
116+
foreach ($this->cellParameters as $parameter) {
117+
$this->assertContains($parameter, $actual, 'Parameter \'' . $parameter . '\' missing in render output.');
118+
}
117119
}
118120

119121
public function testRenderCellTemplateWrongColumnName()
120122
{
121-
$columnName = 'testCellName';
123+
$columnName = 'testCellName';
124+
$wrongColumnName = 'wrongTestCellName';
122125

123-
$this->object->addColumn(
124-
$columnName . 'Wrong',
125-
$this->cellParameters
126-
);
126+
$this->object->addColumn($wrongColumnName, $this->cellParameters);
127127

128128
$this->setExpectedException('\Exception', 'Wrong column name specified.');
129129

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php

Lines changed: 42 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -24,82 +24,64 @@ public function testRender()
2424

2525
$configData = ['advanced/modules_disable_output/testModuleWithConfigData' => 'testModuleData'];
2626

27-
$fieldMock = $this->getMock('Magento\Config\Block\System\Config\Form\Field', [], [], '', false, false, true);
28-
$layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false, false);
27+
$fieldMock = $this->getMockBuilder('Magento\Config\Block\System\Config\Form\Field')
28+
->disableOriginalConstructor()
29+
->getMock();
30+
31+
$layoutMock = $this->getMockBuilder('Magento\Framework\View\Layout')
32+
->disableOriginalConstructor()
33+
->getMock();
2934
$layoutMock->expects($this->once())
3035
->method('getBlockSingleton')
3136
->with('Magento\Config\Block\System\Config\Form\Field')
3237
->willReturn($fieldMock);
3338

34-
$groupMock = $this->getMock(
35-
'Magento\Config\Model\Config\Structure\Element\Group',
36-
[],
37-
[],
38-
'',
39-
false
40-
);
39+
$groupMock = $this->getMockBuilder('Magento\Config\Model\Config\Structure\Element\Group')
40+
->disableOriginalConstructor()
41+
->getMock();
4142
$groupMock->expects($this->once())->method('getFieldsetCss')->willReturn('test_fieldset_css');
4243

43-
$elementMock = $this->getMock(
44-
'Magento\Framework\Data\Form\Element\Text',
45-
[
46-
'getHtmlId', 'getExpanded', 'getElements',
47-
'getLegend', 'getComment', 'addField', 'setRenderer', 'toHtml'
48-
],
49-
[],
50-
'',
51-
false,
52-
false,
53-
true
54-
);
55-
$elementMock->expects(
56-
$this->any()
57-
)->method(
58-
'getHtmlId'
59-
)->willReturn(
60-
$testData['htmlId']
61-
);
44+
$elementMock = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Text')
45+
->disableOriginalConstructor()
46+
->setMethods(
47+
[
48+
'getHtmlId', 'getExpanded', 'getElements','getLegend',
49+
'getComment', 'addField', 'setRenderer', 'toHtml'
50+
]
51+
)
52+
->getMock();
53+
54+
$elementMock->expects($this->any())
55+
->method('getHtmlId')
56+
->willReturn($testData['htmlId']);
57+
6258
$elementMock->expects($this->any())->method('getExpanded')->willReturn(true);
63-
$elementMock->expects(
64-
$this->any()
65-
)->method(
66-
'getLegend'
67-
)->willReturn(
68-
$testData['legend']
69-
);
70-
$elementMock->expects(
71-
$this->any()
72-
)->method(
73-
'getComment'
74-
)->willReturn(
75-
$testData['comment']
76-
);
59+
$elementMock->expects($this->any())->method('getLegend')->willReturn($testData['legend']);
60+
$elementMock->expects($this->any())->method('getComment')->willReturn($testData['comment']);
7761
$elementMock->expects($this->any())->method('addField')->willReturn($elementMock);
7862
$elementMock->expects($this->any())->method('setRenderer')->willReturn($elementMock);
7963
$elementMock->expects($this->any())->method('toHtml')->willReturn('test_element_html');
8064

81-
$moduleListMock = $this->getMock(
82-
'Magento\Framework\Module\ModuleList',
83-
[],
84-
[],
85-
'',
86-
false,
87-
false
88-
);
89-
65+
$moduleListMock = $this->getMockBuilder('Magento\Framework\Module\ModuleList')
66+
->disableOriginalConstructor()
67+
->getMock();
9068
$moduleListMock->expects($this->any())->method('getNames')->willReturn(
9169
array_merge(['Magento_Backend'], $testModuleList)
9270
);
9371

94-
$factory = $this->getMock('Magento\Framework\Data\Form\Element\Factory', [], [], '', false);
95-
$factoryColl = $this->getMock(
96-
'Magento\Framework\Data\Form\Element\CollectionFactory',
97-
[],
98-
[],
99-
'',
100-
false
101-
);
102-
$formMock = $this->getMock('Magento\Framework\Data\Form\AbstractForm', [], [$factory, $factoryColl]);
72+
$factory = $this->getMockBuilder('Magento\Framework\Data\Form\Element\Factory')
73+
->disableOriginalConstructor()
74+
->getMock();
75+
76+
$factoryColl = $this->getMockBuilder('Magento\Framework\Data\Form\Element\CollectionFactory')
77+
->disableOriginalConstructor()
78+
->getMock();
79+
80+
$formMock = $this->getMockBuilder('Magento\Framework\Data\Form\AbstractForm')
81+
->disableOriginalConstructor()
82+
->setConstructorArgs([$factory, $factoryColl])
83+
->getMock();
84+
10385
$formMock->expects($this->any())->method('getConfigValue')->willReturn('testConfigData');
10486

10587
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);

0 commit comments

Comments
 (0)