MC-21001: Add/move/delete attribute for attribute sets

Author: mykhailomatiola

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/SetTest.php

@@ -105,7 +105,9 @@ public function testSaveWithGroupsAndAttributes(string $groupName, string $attri
         ];
         $set->organizeData($this->getAttributeSetData($additional));
         $this->attributeSetResource->save($set);
-        $groupId = $this->getAttributeGroup($groupName)->getAttributeGroupId();
+        $groupId = $attributeGroup
+            ? $attributeGroup->getAttributeGroupId()
+            : $this->getAttributeGroup($groupName)->getAttributeGroupId();
         $this->config->clear();
         $setInfo = $this->attributeSetResource->getSetInfo([$attributeId], $this->defaultSetId);
         $expectedInfo = [
@@ -230,7 +232,7 @@ private function getAttributeSetData(array $additional): array
      * Returns attribute group by name.
      *
      * @param string $groupName
-     * @return AttributeGroupInterface|Group|null
+     * @return AttributeGroupInterface|null
      */
     private function getAttributeGroup(string $groupName): ?AttributeGroupInterface
     {