Skip to content

Commit e71c140

Browse files
author
Valeriy Nayda
committed
MAGETWO-65099: [Performance] Optimize validation of swatches attributes
-- Backport
1 parent 47cc6f6 commit e71c140

File tree

1 file changed

+8
-17
lines changed

1 file changed

+8
-17
lines changed

app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\Swatches\Test\Unit\Helper;
77

8+
use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
9+
use Magento\Framework\EntityManager\MetadataPool;
810
use Magento\Swatches\Model\SwatchAttributesProvider;
911

1012
/**
@@ -36,7 +38,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
3638
/** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Swatches\Model\ResourceModel\Swatch\CollectionFactory */
3739
protected $swatchCollectionFactoryMock;
3840

39-
/** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\ResourceModel\Eav\Attribute */
41+
/** @var \PHPUnit_Framework_MockObject_MockObject|Attribute */
4042
protected $attributeMock;
4143

4244
/** @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager */
@@ -48,7 +50,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
4850
/** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Api\ProductRepositoryInterface */
4951
protected $productRepoMock;
5052

51-
/** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\EntityManager\MetadataPool*/
53+
/** @var \PHPUnit_Framework_MockObject_MockObject|MetadataPool*/
5254
private $metaDataPoolMock;
5355

5456
/**
@@ -108,26 +110,15 @@ protected function setUp()
108110
false
109111
);
110112

111-
$this->attributeMock = $this->getMock(
112-
\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
113-
[],
114-
[],
115-
'',
116-
false
117-
);
118-
$this->metaDataPoolMock = $this->getMock(
119-
\Magento\Framework\EntityManager\MetadataPool::class,
120-
[],
121-
[],
122-
'',
123-
false
124-
);
113+
$this->attributeMock = $this->getMockBuilder(Attribute::class)
114+
->disableOriginalConstructor();
115+
$this->metaDataPoolMock = $this->getMockBuilder(MetadataPool::class)
116+
->disableOriginalConstructor();
125117

126118
$serializer = $this->getMock(
127119
\Magento\Framework\Serialize\Serializer\Json::class,
128120
['serialize', 'unserialize']
129121
);
130-
131122
$serializer->expects($this->any())
132123
->method('serialize')->willReturnCallback(function ($parameter) {
133124
return json_encode($parameter);

0 commit comments

Comments
 (0)