Tests refactoring

Author: rogyar

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

@@ -89,7 +89,7 @@
 $customOptions = [];
 
 /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
-$customOptionFactory = $objectManager->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+$customOptionFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
 
 foreach ($options as $option) {
     /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $customOption */
@@ -102,5 +102,5 @@
 $product->setOptions($customOptions);
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepositoryFactory */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 $productRepository->save($product);

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

@@ -15,9 +15,11 @@
 );
 try {
     $product = $repository->get('simple', false, null, true);
-    $product->delete();
+    $repository->delete($product);
 } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
     //Entity already deleted
+} catch (\Magento\Framework\Exception\StateException $e) {
+
 }
 
 $registry->unregister('isSecureArea');

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

@@ -28,5 +28,5 @@
         ]
     );
 /** @var ProductResource $productResource */
-$productResource = Bootstrap::getObjectManager()->create(ProductResource::class);
+$productResource = Bootstrap::getObjectManager()->get(ProductResource::class);
 $productResource->save($product);

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

@@ -89,7 +89,7 @@
 $customOptions = [];
 
 /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
-$customOptionFactory = $objectManager->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+$customOptionFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
 
 foreach ($options as $option) {
     /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $customOption */

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

@@ -15,9 +15,10 @@
 );
 try {
     $product = $repository->get('virtual', false, null, true);
-    $product->delete();
+    $repository->delete($product);
 } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
     //Entity already deleted
+} catch (\Magento\Framework\Exception\StateException $e) {
 }
 
 $registry->unregister('isSecureArea');