MC-20689: Admin: Create new attribute set

Author: IvanPletnyov

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

@@ -310,7 +310,7 @@ private function createAttributeSetBySkeletonAndAssert(
         );
         $this->dispatch('backend/catalog/product_set/save/');
         $this->assertSessionMessages(
-            $this->contains('You saved the attribute set.'),
+            $this->equalTo([(string)__('You saved the attribute set.')]),
             MessageInterface::TYPE_SUCCESS
         );
         $createdAttributeSet = $this->getAttributeSetByName($attributeSetName);
@@ -339,16 +339,15 @@ private function assertAttributeSetsAttributesAreEquals(
                 $existAttributeSet->getAttributeSetId()
             )
         );
+        sort($expectedAttributeIds);
         $actualAttributeIds = array_keys(
             $this->attributeManagement->getAttributes(
                 ProductAttributeInterface::ENTITY_TYPE_CODE,
                 $createdAttributeSet->getAttributeSetId()
             )
         );
-        $this->assertEquals(count($expectedAttributeIds), count($actualAttributeIds));
-        foreach ($actualAttributeIds as $attributeId) {
-            $this->assertContains($attributeId, $expectedAttributeIds);
-        }
+        sort($actualAttributeIds);
+        $this->assertSame($expectedAttributeIds, $actualAttributeIds);
     }
 
     /**