Merge branch 'MC-11151' into 'MC-18821'

MC-18821: Increase test coverage for Catalog functional area

See merge request magn-m23/magn-m23!1646

Author: stkorf

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

@@ -172,7 +172,9 @@ public function testRemoveAttributeFromAttributeSet()
         $product->setAttributeSetId($attributeSet->getId());
         $product = $this->productRepository->save($product);
         $this->dispatch('backend/catalog/product/edit/id/' . $product->getEntityId());
-        $this->assertNotContains($message, $this->getSyslogContent());
+        $syslogPath = $this->getSyslogPath();
+        $syslogContent = file_exists($syslogPath) ? file_get_contents($syslogPath) : '';
+        $this->assertNotContains($message, $syslogContent);
     }
 
     /**
@@ -200,33 +202,9 @@ private function getSyslogPath()
      */
     private function removeSyslog()
     {
-        $this->detachLogger();
+        $this->syslogHandler->close();
         if (file_exists($this->getSyslogPath())) {
             unlink($this->getSyslogPath());
         }
     }
-
-    /**
-     * Detach system log handler.
-     *
-     * @return void
-     */
-    private function detachLogger()
-    {
-        $this->syslogHandler->close();
-    }
-
-    /**
-     * Retrieve content of system.log file
-     *
-     * @return bool|string
-     */
-    private function getSyslogContent()
-    {
-        if (!file_exists($this->getSyslogPath())) {
-            return '';
-        }
-
-        return file_get_contents($this->getSyslogPath());
-    }
 }

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

@@ -9,8 +9,8 @@
 $entityType = $objectManager->create(\Magento\Eav\Model\Entity\Type::class)->loadByCode('catalog_product');
 
 $attributeSetCollection = $objectManager->create(
-    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::class
-);
+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory::class
+)->create();
 $attributeSetCollection->addFilter('attribute_set_name', 'new_attribute_set');
 $attributeSetCollection->addFilter('entity_type_id', $entityType->getId());
 $attributeSetCollection->setOrder('attribute_set_id');