Skip to content

Commit b92373a

Browse files
committed
ACP2E-3752: Duplicate of AC-13913 - Static attribute cleaning asynchronously.
1 parent 4fa8ec0 commit b92373a

File tree

4 files changed

+0
-38
lines changed

4 files changed

+0
-38
lines changed

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as ProductAttributeCollection;
1313
use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as ProductAttributeCollectionFactory;
1414
use Magento\CatalogImportExport\Model\Import\Product;
15-
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
1615
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
1716
use Magento\Framework\App\ResourceConnection;
1817
use Magento\Framework\App\ScopeInterface;
@@ -72,11 +71,6 @@ class BundleTest extends AbstractImportTestCase
7271
*/
7372
private $prodAttrColFac;
7473

75-
/**
76-
* @var Collection|MockObject
77-
*/
78-
private $setCollection;
79-
8074
/**
8175
* @var ScopeResolverInterface|MockObject
8276
*/
@@ -182,9 +176,6 @@ protected function setUp(): void
182176
$this->resource->expects($this->any())->method('getConnection')->willReturn($this->connection);
183177
$this->resource->expects($this->any())->method('getTableName')->willReturn('tableName');
184178
$this->attrSetColFac = $this->createMock(AttributeSetCollectionFactory::class);
185-
$this->setCollection = $this->createMock(Collection::class);
186-
$this->attrSetColFac->expects($this->any())->method('create')->willReturn($this->setCollection);
187-
$this->setCollection->expects($this->any())->method('setEntityTypeFilter')->willReturn([]);
188179
$this->prodAttrColFac = $this->createMock(ProductAttributeCollectionFactory::class);
189180
$attrCollection = $this->createMock(ProductAttributeCollection::class);
190181
$attrCollection->expects($this->any())->method('addFieldToFilter')->willReturnSelf();

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/SimpleTest.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
use Magento\CatalogImportExport\Model\Import\Product;
1313
use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
1414
use Magento\CatalogImportExport\Model\Import\Product\Type\Simple;
15-
use Magento\Eav\Model\Entity\Attribute\Set;
1615
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Collection as AttributeCollection;
17-
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
1816
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
1917
use Magento\Framework\App\ResourceConnection;
2018
use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -64,9 +62,7 @@ protected function setUp(): void
6462
{
6563
$this->entityModel = $this->createMock(Product::class);
6664
$attrSetColFactory = $this->createMock(AttributeSetCollectionFactory::class);
67-
$attrSetCollection = $this->createMock(Collection::class);
6865
$attrColFactory = $this->createMock(AttributeCollectionFactory::class);
69-
$attributeSet = $this->createMock(Set::class);
7066
$attrCollection = $this->createMock(AttributeCollection::class);
7167
$attribute = $this->getMockBuilder(Attribute::class)
7268
->addMethods(['getFrontendLabel'])
@@ -155,18 +151,10 @@ protected function setUp(): void
155151
return ['yes' => 1, 'no' => 0];
156152
}
157153
});
158-
$attrSetColFactory->method('create')
159-
->willReturn($attrSetCollection);
160-
$attrSetCollection->method('setEntityTypeFilter')
161-
->willReturn([$attributeSet]);
162154
$attrColFactory->method('create')
163155
->willReturn($attrCollection);
164156
$attrCollection->method('setAttributeSetFilter')
165157
->willReturn([$attribute1, $attribute2, $attribute3]);
166-
$attributeSet->method('getId')
167-
->willReturn(1);
168-
$attributeSet->method('getAttributeSetName')
169-
->willReturn('attribute_set_name');
170158
$attrCollection->method('addFieldToFilter')
171159
->willReturnSelf();
172160
$attrCollection->method('getItems')

app/code/Magento/DownloadableImportExport/Test/Unit/Model/Import/Product/Type/DownloadableTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Magento\DownloadableImportExport\Helper\Uploader as UploaderHelper;
1818
use Magento\DownloadableImportExport\Model\Import\Product\Type\Downloadable;
1919
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory as AttributeOptionCollectionFactory;
20-
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection as AttributeSetCollection;
2120
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
2221
use Magento\Framework\App\ResourceConnection;
2322
use Magento\Framework\DB\Adapter\Pdo\Mysql;
@@ -52,11 +51,6 @@ class DownloadableTest extends AbstractImportTestCase
5251
*/
5352
private $attrSetColFacMock;
5453

55-
/**
56-
* @var AttributeSetCollection|MockObject
57-
*/
58-
private $attrSetColMock;
59-
6054
/**
6155
* @var ProductAttributeCollectionFactory|MockObject
6256
*/
@@ -149,8 +143,6 @@ protected function setUp(): void
149143
//constructor arguments:
150144
// 1. $attrSetColFac
151145
$this->attrSetColFacMock = $this->createMock(AttributeSetCollectionFactory::class);
152-
$this->attrSetColMock = $this->createMock(AttributeSetCollection::class);
153-
$this->attrSetColMock->expects($this->any())->method('setEntityTypeFilter')->willReturn([]);
154146

155147
// 2. $prodAttrColFac
156148
$this->prodAttrColFacMock = $this->createMock(ProductAttributeCollectionFactory::class);

app/code/Magento/GroupedImportExport/Test/Unit/Model/Import/Product/Type/GroupedTest.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as ProductAttributeCollectionFactory;
1313
use Magento\CatalogImportExport\Model\Import\Product;
1414
use Magento\CatalogImportExport\Model\Import\Product\SkuStorage;
15-
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection as AttributeSetCollection;
1615
use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
1716
use Magento\Framework\App\ResourceConnection;
1817
use Magento\Framework\DB\Adapter\Pdo\Mysql;
@@ -41,11 +40,6 @@ class GroupedTest extends AbstractImportTestCase
4140
*/
4241
private $setCollectionFactory;
4342

44-
/**
45-
* @var AttributeSetCollection|MockObject
46-
*/
47-
private $setCollection;
48-
4943
/**
5044
* @var ProductAttributeCollectionFactory|MockObject
5145
*/
@@ -106,9 +100,6 @@ protected function setUp(): void
106100
parent::setUp();
107101

108102
$this->setCollectionFactory = $this->createMock(AttributeSetCollectionFactory::class);
109-
$this->setCollection = $this->createMock(AttributeSetCollection::class);
110-
$this->setCollectionFactory->method('create')->willReturn($this->setCollection);
111-
$this->setCollection->expects($this->any())->method('setEntityTypeFilter')->willReturn([]);
112103
$this->attrCollectionFactory = $this->createMock(ProductAttributeCollectionFactory::class);
113104
$this->attrCollection = $this->createMock(ProductAttributeCollection::class);
114105
$this->attrCollectionFactory->method('create')->willReturn($this->attrCollection);

0 commit comments

Comments
 (0)