MC-33312: [2.3][Integration] Test fix

Author: zakdma

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

@@ -10,6 +10,12 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 
 $products = [
     [
@@ -90,14 +96,13 @@
 ];
 
 /** @var CategoryLinkManagementInterface $categoryLinkManagement */
-$categoryLinkManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(CategoryLinkManagementInterface::class);
+$categoryLinkManagement = $objectManager->create(CategoryLinkManagementInterface::class);
 
 $categoriesToAssign = [];
 
 foreach ($products as $data) {
     /** @var $product Product */
-    $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Product::class);
+    $product = $objectManager->create(Product::class);
     $product
         ->setTypeId($data['type'])
         ->setId($data['id'])
@@ -111,8 +116,8 @@
         ->setMetaDescription($data['meta_keyword'])
         ->setVisibility($data['visibility'])
         ->setStatus($data['status'])
-        ->setStockData(['use_config_manage_stock' => 0])
-        ->save();
+        ->setStockData(['use_config_manage_stock' => 0]);
+    $productRepository->save($product);
 
     $categoriesToAssign[$data['sku']][] = $data['category_id'];
 }

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

@@ -10,15 +10,16 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 Bootstrap::getInstance()->getInstance()->reinitialize();
+$objectManager = Bootstrap::getObjectManager();
 
 /** @var Registry $registry */
-$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$registry = $objectManager->get(Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
 /** @var ProductRepositoryInterface $productRepository */
-$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 
 $productSkus = ['search_product_1', 'search_product_2', 'search_product_3', 'search_product_4', 'search_product_5'];
 foreach ($productSkus as $sku) {

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php

@@ -21,7 +21,7 @@
 
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = Bootstrap::getObjectManager()
-    ->create(ProductRepositoryInterface::class);
+    ->get(ProductRepositoryInterface::class);
 
 /** @var $installer CategorySetup */
 $installer = Bootstrap::getObjectManager()->create(CategorySetup::class);

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_12345.php

@@ -21,7 +21,7 @@
 
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = Bootstrap::getObjectManager()
-    ->create(ProductRepositoryInterface::class);
+    ->get(ProductRepositoryInterface::class);
 
 /** @var $installer CategorySetup */
 $installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
@@ -105,7 +105,7 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 try {
-    $productToDelete = $productRepository->getById(11);
+    $productToDelete = $productRepository->getById(111);
     $productRepository->delete($productToDelete);
 
     /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $itemResource */