Skip to content

Commit e386966

Browse files
author
Sergey Shvets
committed
MAGETWO-97345: [Magento Cloud] Import doesn't work with skip error entries
1 parent f4a6515 commit e386966

File tree

1 file changed

+46
-45
lines changed

1 file changed

+46
-45
lines changed

‎app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/ProductTest.php

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
1111
use Magento\Framework\App\Filesystem\DirectoryList;
1212
use Magento\ImportExport\Model\Import;
13+
use PHPUnit\Framework\MockObject\MockObject;
1314

1415
/**
1516
* Class ProductTest
@@ -28,122 +29,122 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
2829

2930
const ENTITY_ID = 13;
3031

31-
/** @var \Magento\Framework\DB\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject */
32+
/** @var \Magento\Framework\DB\Adapter\AdapterInterface| MockObject */
3233
protected $_connection;
3334

34-
/** @var \Magento\Framework\Json\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
35+
/** @var \Magento\Framework\Json\Helper\Data| MockObject */
3536
protected $jsonHelper;
3637

37-
/** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|\PHPUnit_Framework_MockObject_MockObject */
38+
/** @var \Magento\ImportExport\Model\ResourceModel\Import\Data| MockObject */
3839
protected $_dataSourceModel;
3940

40-
/** @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject */
41+
/** @var \Magento\Framework\App\ResourceConnection| MockObject */
4142
protected $resource;
4243

43-
/** @var \Magento\ImportExport\Model\ResourceModel\Helper|\PHPUnit_Framework_MockObject_MockObject */
44+
/** @var \Magento\ImportExport\Model\ResourceModel\Helper| MockObject */
4445
protected $_resourceHelper;
4546

46-
/** @var \Magento\Framework\Stdlib\StringUtils|\PHPUnit_Framework_MockObject_MockObject */
47+
/** @var \Magento\Framework\Stdlib\StringUtils|MockObject */
4748
protected $string;
4849

49-
/** @var \Magento\Framework\Event\ManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
50+
/** @var \Magento\Framework\Event\ManagerInterface|MockObject */
5051
protected $_eventManager;
5152

52-
/** @var \Magento\CatalogInventory\Api\StockRegistryInterface|\PHPUnit_Framework_MockObject_MockObject */
53+
/** @var \Magento\CatalogInventory\Api\StockRegistryInterface|MockObject */
5354
protected $stockRegistry;
5455

55-
/** @var \Magento\CatalogImportExport\Model\Import\Product\OptionFactory|\PHPUnit_Framework_MockObject_MockObject */
56+
/** @var \Magento\CatalogImportExport\Model\Import\Product\OptionFactory|MockObject */
5657
protected $optionFactory;
5758

58-
/** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject */
59+
/** @var \Magento\CatalogInventory\Api\StockConfigurationInterface|MockObject */
5960
protected $stockConfiguration;
6061

61-
/** @var \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface|\PHPUnit_Framework_MockObject_MockObject */
62+
/** @var \Magento\CatalogInventory\Model\Spi\StockStateProviderInterface|MockObject */
6263
protected $stockStateProvider;
6364

64-
/** @var \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject */
65+
/** @var \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject */
6566
protected $optionEntity;
6667

67-
/** @var \Magento\Framework\Stdlib\DateTime|\PHPUnit_Framework_MockObject_MockObject */
68+
/** @var \Magento\Framework\Stdlib\DateTime|MockObject */
6869
protected $dateTime;
6970

7071
/** @var array */
7172
protected $data;
7273

73-
/** @var \Magento\ImportExport\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
74+
/** @var \Magento\ImportExport\Helper\Data|MockObject */
7475
protected $importExportData;
7576

76-
/** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|\PHPUnit_Framework_MockObject_MockObject */
77+
/** @var \Magento\ImportExport\Model\ResourceModel\Import\Data|MockObject */
7778
protected $importData;
7879

79-
/** @var \Magento\Eav\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
80+
/** @var \Magento\Eav\Model\Config|MockObject */
8081
protected $config;
8182

82-
/** @var \Magento\ImportExport\Model\ResourceModel\Helper|\PHPUnit_Framework_MockObject_MockObject */
83+
/** @var \Magento\ImportExport\Model\ResourceModel\Helper|MockObject */
8384
protected $resourceHelper;
8485

85-
/** @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
86+
/** @var \Magento\Catalog\Helper\Data|MockObject */
8687
protected $_catalogData;
8788

88-
/** @var \Magento\ImportExport\Model\Import\Config|\PHPUnit_Framework_MockObject_MockObject */
89+
/** @var \Magento\ImportExport\Model\Import\Config|MockObject */
8990
protected $_importConfig;
9091

91-
/** @var \PHPUnit_Framework_MockObject_MockObject */
92+
/** @var MockObject */
9293
protected $_resourceFactory;
9394

9495
// @codingStandardsIgnoreStart
95-
/** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject */
96+
/** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory|MockObject */
9697
protected $_setColFactory;
9798

98-
/** @var \Magento\CatalogImportExport\Model\Import\Product\Type\Factory|\PHPUnit_Framework_MockObject_MockObject */
99+
/** @var \Magento\CatalogImportExport\Model\Import\Product\Type\Factory|MockObject */
99100
protected $_productTypeFactory;
100101

101-
/** @var \Magento\Catalog\Model\ResourceModel\Product\LinkFactory|\PHPUnit_Framework_MockObject_MockObject */
102+
/** @var \Magento\Catalog\Model\ResourceModel\Product\LinkFactory|MockObject */
102103
protected $_linkFactory;
103104

104-
/** @var \Magento\CatalogImportExport\Model\Import\Proxy\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
105+
/** @var \Magento\CatalogImportExport\Model\Import\Proxy\ProductFactory|MockObject */
105106
protected $_proxyProdFactory;
106107

107-
/** @var \Magento\CatalogImportExport\Model\Import\UploaderFactory|\PHPUnit_Framework_MockObject_MockObject */
108+
/** @var \Magento\CatalogImportExport\Model\Import\UploaderFactory|MockObject */
108109
protected $_uploaderFactory;
109110

110-
/** @var \Magento\Framework\Filesystem|\PHPUnit_Framework_MockObject_MockObject */
111+
/** @var \Magento\Framework\Filesystem|MockObject */
111112
protected $_filesystem;
112113

113-
/** @var \Magento\Framework\Filesystem\Directory\WriteInterface|\PHPUnit_Framework_MockObject_MockObject */
114+
/** @var \Magento\Framework\Filesystem\Directory\WriteInterface|MockObject */
114115
protected $_mediaDirectory;
115116

116-
/** @var \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory|\PHPUnit_Framework_MockObject_MockObject */
117+
/** @var \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory|MockObject */
117118
protected $_stockResItemFac;
118119

119-
/** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject */
120+
/** @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|MockObject */
120121
protected $_localeDate;
121122

122-
/** @var \Magento\Framework\Indexer\IndexerRegistry|\PHPUnit_Framework_MockObject_MockObject */
123+
/** @var \Magento\Framework\Indexer\IndexerRegistry|MockObject */
123124
protected $indexerRegistry;
124125

125-
/** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
126+
/** @var \Psr\Log\LoggerInterface|MockObject */
126127
protected $_logger;
127128

128-
/** @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|\PHPUnit_Framework_MockObject_MockObject */
129+
/** @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|MockObject */
129130
protected $storeResolver;
130131

131-
/** @var \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor|\PHPUnit_Framework_MockObject_MockObject */
132+
/** @var \Magento\CatalogImportExport\Model\Import\Product\SkuProcessor|MockObject */
132133
protected $skuProcessor;
133134

134-
/** @var \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor|\PHPUnit_Framework_MockObject_MockObject */
135+
/** @var \Magento\CatalogImportExport\Model\Import\Product\CategoryProcessor|MockObject */
135136
protected $categoryProcessor;
136137

137-
/** @var \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject */
138+
/** @var \Magento\CatalogImportExport\Model\Import\Product\Validator|MockObject */
138139
protected $validator;
139140

140-
/** @var \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor|\PHPUnit_Framework_MockObject_MockObject */
141+
/** @var \Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor|MockObject */
141142
protected $objectRelationProcessor;
142143

143-
/** @var \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
144+
/** @var \Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface|MockObject */
144145
protected $transactionManager;
145146

146-
/** @var \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor|\PHPUnit_Framework_MockObject_MockObject */
147+
/** @var \Magento\CatalogImportExport\Model\Import\Product\TaxClassProcessor|MockObject */
147148
// @codingStandardsIgnoreEnd
148149
protected $taxClassProcessor;
149150

@@ -155,13 +156,13 @@ class ProductTest extends \Magento\ImportExport\Test\Unit\Model\Import\AbstractI
155156
*/
156157
protected $errorAggregator;
157158

158-
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
159+
/** @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject */
159160
protected $scopeConfig;
160161

161-
/** @var \Magento\Catalog\Model\Product\Url|\PHPUnit_Framework_MockObject_MockObject */
162+
/** @var \Magento\Catalog\Model\Product\Url|MockObject */
162163
protected $productUrl;
163164

164-
/** @var ImageTypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
165+
/** @var ImageTypeProcessor|MockObject */
165166
protected $imageTypeProcessor;
166167

167168
/**
@@ -1662,7 +1663,7 @@ protected function overrideMethod(&$object, $methodName, array $parameters = [])
16621663
* @see _setValidatorMockInImportProduct()
16631664
* @param Product
16641665
* Param should go with rewritten getOptionEntity method.
1665-
* @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
1666+
* @return \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject
16661667
*/
16671668
private function _suppressValidateRowOptionValidatorInvalidRows($importProduct)
16681669
{
@@ -1679,7 +1680,7 @@ private function _suppressValidateRowOptionValidatorInvalidRows($importProduct)
16791680
* Set validator mock in importProduct, return true for isValid method.
16801681
*
16811682
* @param Product
1682-
* @return \Magento\CatalogImportExport\Model\Import\Product\Validator|\PHPUnit_Framework_MockObject_MockObject
1683+
* @return \Magento\CatalogImportExport\Model\Import\Product\Validator|MockObject
16831684
*/
16841685
private function _setValidatorMockInImportProduct($importProduct)
16851686
{
@@ -1695,7 +1696,7 @@ private function _setValidatorMockInImportProduct($importProduct)
16951696
*
16961697
* @param Product
16971698
* Param should go with rewritten getOptionEntity method.
1698-
* @return \Magento\CatalogImportExport\Model\Import\Product\Option|\PHPUnit_Framework_MockObject_MockObject
1699+
* @return \Magento\CatalogImportExport\Model\Import\Product\Option|MockObject
16991700
*/
17001701
private function _rewriteGetOptionEntityInImportProduct($importProduct)
17011702
{
@@ -1710,7 +1711,7 @@ private function _rewriteGetOptionEntityInImportProduct($importProduct)
17101711
/**
17111712
* @param array $methods
17121713
* @param array $errorAggregatorMethods
1713-
* @return \PHPUnit_Framework_MockObject_MockObject
1714+
* @return MockObject
17141715
*/
17151716
protected function createModelMockWithErrorAggregator(array $methods = [], array $errorAggregatorMethods = [])
17161717
{

0 commit comments

Comments
 (0)