MC-20425: [Integration Test] Check behavior when attribute set was changed to a new set with deleted attribute from the previous set

Author: zakdma

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

@@ -41,7 +41,7 @@
         $groupAttributes,
         function ($attribute) use ($attributeCountryOfManufacture) {
             /** @var ProductAttributeInterface $attribute */
-            return $attribute->getAttributeId() != $attributeCountryOfManufacture->getAttributeId();
+            return (int)$attribute->getAttributeId() !== (int)$attributeCountryOfManufacture->getAttributeId();
         }
     );
     if (count($newAttributes) < count($groupAttributes)) {

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

@@ -29,7 +29,7 @@
     ->setPrice(10)
     ->setWeight(1)
     ->setCountryOfManufacture('AO')
-    ->setShortDescription("Short description")
+    ->setShortDescription('Short description')
     ->setTaxClassId(0)
     ->setDescription('Description')
     ->setMetaTitle('meta title')