MC-20691: Admin: Update attribute set

Author: IvanPletnyov

dev/tests/integration/framework/Magento/TestFramework/Eav/Model/AttributeSet.php renamed to dev/tests/integration/framework/Magento/TestFramework/Eav/Model/GetAttributeSetByName.php

@@ -14,7 +14,7 @@
 /**
  * Attribute set additional functions.
  */
-class AttributeSet
+class GetAttributeSetByName
 {
     /**
      * @var SearchCriteriaBuilder
@@ -44,7 +44,7 @@ public function __construct(
      * @param string $attributeSetName
      * @return AttributeSetInterface|null
      */
-    public function getAttributeSetByName(string $attributeSetName): ?AttributeSetInterface
+    public function execute(string $attributeSetName): ?AttributeSetInterface
     {
         $this->searchCriteriaBuilder->addFilter('attribute_set_name', $attributeSetName);
         $searchCriteria = $this->searchCriteriaBuilder->create();

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/UpdateTest.php

@@ -17,7 +17,7 @@
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\TestFramework\Eav\Model\AttributeSet;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
 use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
@@ -46,9 +46,9 @@ class UpdateTest extends AbstractBackendController
     private $attributeGroupCollectionFactory;
 
     /**
-     * @var AttributeSet
+     * @var GetAttributeSetByName
      */
-    private $attributeSet;
+    private $getAttributeSetByName;
 
     /**
      * @inheritdoc
@@ -60,7 +60,7 @@ protected function setUp()
         $this->attributeSetRepository = $this->_objectManager->get(AttributeSetRepositoryInterface::class);
         $this->attributeManagement = $this->_objectManager->get(AttributeManagementInterface::class);
         $this->attributeGroupCollectionFactory = $this->_objectManager->get(CollectionFactory::class);
-        $this->attributeSet = $this->_objectManager->get(AttributeSet::class);
+        $this->getAttributeSetByName = $this->_objectManager->get(GetAttributeSetByName::class);
     }
 
     /**
@@ -74,7 +74,7 @@ protected function setUp()
      */
     public function testUpdateAttributeSetName(): void
     {
-        $attributeSet = $this->attributeSet->getAttributeSetByName('new_attribute_set');
+        $attributeSet = $this->getAttributeSetByName->execute('new_attribute_set');
         $currentAttrSetName = $attributeSet->getAttributeSetName();
         $this->assertNotNull($attributeSet);
         $postData = $this->prepareDataToRequest($attributeSet);
@@ -102,7 +102,7 @@ public function testUpdateAttributeSetName(): void
      */
     public function testUpdateAttributeSetWithNewGroup(): void
     {
-        $currentAttrSet = $this->attributeSet->getAttributeSetByName('new_attribute_set');
+        $currentAttrSet = $this->getAttributeSetByName->execute('new_attribute_set');
         $this->assertNotNull($currentAttrSet);
         $attrSetId = (int)$currentAttrSet->getAttributeSetId();
         $currentAttrGroups = $this->getAttributeSetGroupCollection($attrSetId)->getItems();
@@ -140,18 +140,14 @@ public function testUpdateAttributeSetWithNewGroup(): void
     public function testDeleteCustomGroupFromCustomAttributeSet(): void
     {
         $testGroupName = 'Test attribute group name';
-        $currentAttrSet = $this->attributeSet->getAttributeSetByName('new_attribute_set');
+        $currentAttrSet = $this->getAttributeSetByName->execute('new_attribute_set');
         $this->assertNotNull($currentAttrSet);
         $attrSetId = (int)$currentAttrSet->getAttributeSetId();
-        $currentAttrGroups = $this->getAttributeSetGroupCollection($attrSetId)->getItems();
-        $customGroup = null;
-        /** @var AttributeGroupInterface $attrGroup */
-        foreach ($currentAttrGroups as $attrGroup) {
-            if ($attrGroup->getAttributeGroupName() === $testGroupName) {
-                $customGroup = $attrGroup;
-                break;
-            }
-        }
+        $currentAttrGroupsCollection = $this->getAttributeSetGroupCollection($attrSetId);
+        $customGroup = $currentAttrGroupsCollection->getItemByColumnValue(
+            AttributeGroupInterface::GROUP_NAME,
+            $testGroupName
+        );
         $this->assertNotNull($customGroup);
         $postData = $this->prepareDataToRequest($currentAttrSet);
         $postData['removeGroups'] = [
@@ -163,7 +159,7 @@ public function testDeleteCustomGroupFromCustomAttributeSet(): void
             MessageInterface::TYPE_SUCCESS
         );
         $updatedAttrGroups = $this->getAttributeSetGroupCollection($attrSetId)->getItems();
-        $diffGroups = array_diff_key($currentAttrGroups, $updatedAttrGroups);
+        $diffGroups = array_diff_key($currentAttrGroupsCollection->getItems(), $updatedAttrGroups);
         $this->assertCount(1, $diffGroups);
         /** @var AttributeGroupInterface $deletedGroup */
         $deletedGroup = reset($diffGroups);

dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_with_custom_group_rollback.php

@@ -5,28 +5,16 @@
  */
 declare(strict_types=1);
 
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Eav\Api\AttributeSetRepositoryInterface;
-use Magento\Eav\Api\Data\AttributeSetInterface;
-use Magento\Eav\Model\Entity\Type;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var GetAttributeSetByName $getAttributeSetByName */
+$getAttributeSetByName = $objectManager->get(GetAttributeSetByName::class);
 /** @var AttributeSetRepositoryInterface $attributeSetRepository */
 $attributeSetRepository = $objectManager->get(AttributeSetRepositoryInterface::class);
-/** @var Type $entityType */
-$entityType = $objectManager->create(Type::class)->loadByCode(ProductAttributeInterface::ENTITY_TYPE_CODE);
-/** @var Collection $attributeSetCollection */
-$attributeSetCollection = $objectManager->create(CollectionFactory::class)->create();
-$attributeSetCollection->addFilter('attribute_set_name', 'new_attribute_set');
-$attributeSetCollection->addFilter('entity_type_id', $entityType->getId());
-$attributeSetCollection->setOrder('attribute_set_id');
-$attributeSetCollection->setPageSize(1);
-$attributeSetCollection->load();
-/** @var AttributeSetInterface $attributeSet */
-$attributeSet = $attributeSetCollection->fetchItem();
+$attributeSet = $getAttributeSetByName->execute('new_attribute_set');
 
 if ($attributeSet) {
     $attributeSetRepository->delete($attributeSet);

dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_test_attribute_set.php

@@ -9,7 +9,7 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ProductFactory;
-use Magento\TestFramework\Eav\Model\AttributeSet;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -20,13 +20,12 @@
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 /** @var ProductFactory $productFactory */
 $productFactory = $objectManager->get(ProductFactory::class);
-/** @var AttributeSet $attributeSet */
-$attributeSet = $objectManager->get(AttributeSet::class);
-$customAttributeSet = $attributeSet->getAttributeSetByName('new_attribute_set');
+/** @var GetAttributeSetByName $attributeSet */
+$attributeSet = $objectManager->get(GetAttributeSetByName::class);
+$customAttributeSet = $attributeSet->execute('new_attribute_set');
 $product = $productFactory->create();
 $product
     ->setTypeId('simple')
-    ->setId(1)
     ->setAttributeSetId($customAttributeSet->getAttributeSetId())
     ->setWebsiteIds([1])
     ->setStoreId($storeManager->getStore('admin')->getId())

dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_test_attribute_set_rollback.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\CatalogInventory\Model\StockRegistryStorage;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -22,8 +23,8 @@
 try {
     $product = $productRepository->get('simple');
     $productRepository->delete($product);
-} catch (\Exception $e) {
-
+} catch (NoSuchEntityException $e) {
+    //Product already deleted.
 }
 $stockRegistryStorage->clean();
 $registry->unregister('isSecureArea');