Tests refactoring

Author: rogyar

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartTest.php

@@ -7,12 +7,12 @@
 
 namespace Magento\GraphQl\Quote;
 
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
-use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 class AddSimpleProductToCartTest extends GraphQlAbstract
 {
@@ -65,13 +65,7 @@ public function testAddSimpleProductWithOptions()
         /* Generate customizable options fragment for GraphQl request */
         $queryCustomizableOptions = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = <<<QUERY
 mutation {  
@@ -157,7 +151,7 @@ public function testAddSimpleProductToCartWithNegativeQty()
     /**
      * @return string
      */
-    public function getMaskedQuoteId() : string
+    private function getMaskedQuoteId() : string
     {
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
@@ -251,13 +245,7 @@ public function testAddSimpleProductWithNoRequiredOptionsSet()
         $sku = 'simple';
         $qty = 1;
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = <<<QUERY
 mutation {  

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddVirtualProductToCartTest.php

@@ -7,23 +7,23 @@
 
 namespace Magento\GraphQl\Quote;
 
+use Magento\Quote\Model\QuoteFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 
 class AddVirtualProductToCartTest extends GraphQlAbstract
 {
     /**
-     * @var QuoteResource
+     * @var QuoteFactory
      */
-    private $quoteResource;
+    private $quoteFactory;
     /**
-     * @var Quote
+     * @var QuoteResource
      */
-    private $quote;
+    private $quoteResource;
 
     /**
      * @var QuoteIdToMaskedQuoteIdInterface
@@ -42,7 +42,7 @@ protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->get(QuoteResource::class);
-        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteFactory = $objectManager->get(QuoteFactory::class);
         $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
         $this->productCustomOptionsRepository = $objectManager->get(ProductCustomOptionRepositoryInterface::class);
     }
@@ -64,13 +64,7 @@ public function testAddVirtualProductWithOptions()
         /* Generate customizable options fragment for GraphQl request */
         $queryCustomizableOptions = preg_replace('/"([^"]+)"\s*:\s*/', '$1:', json_encode($customOptionsValues));
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = <<<QUERY
 mutation {  
@@ -130,13 +124,7 @@ public function testAddVirtualProductWithNoRequiredOptionsSet()
         $sku = 'virtual';
         $qty = 1;
 
-        $this->quoteResource->load(
-            $this->quote,
-            'test_order_1',
-            'reserved_order_id'
-        );
-
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $maskedQuoteId = $this->getMaskedQuoteId();
 
         $query = <<<QUERY
 mutation {  
@@ -206,4 +194,15 @@ private function getCustomOptionsValuesForQuery(string $sku): array
 
         return $customOptionsValues;
     }
+
+    /**
+     * @return string
+     */
+    public function getMaskedQuoteId() : string
+    {
+        $quote = $this->quoteFactory->create();
+        $this->quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+        return $this->quoteIdToMaskedId->execute((int)$quote->getId());
+    }
 }

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

@@ -4,8 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+use Magento\Catalog\Model\ProductFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+
+$productFactory = Bootstrap::getObjectManager()->get(ProductFactory::class);
+$product = $productFactory->create();
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL)
     ->setId(21)
     ->setAttributeSetId(4)
@@ -22,4 +26,7 @@
             'is_in_stock' => 1,
             'manage_stock' => 1,
         ]
-    )->save();
+    );
+/** @var ProductResource $productResource */
+$productResource = Bootstrap::getObjectManager()->create(ProductResource::class);
+$productResource->save($product);

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

@@ -4,22 +4,25 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository = Bootstrap::getObjectManager()
+    ->create(ProductRepositoryInterface::class);
 
 try {
     $product = $productRepository->get('virtual-product', false, null, true);
     $productRepository->delete($product);
-} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+} catch (NoSuchEntityException $exception) {
     //Product already removed
-} catch (\Magento\Framework\Exception\StateException $exception) {
+} catch (StateException $exception) {
 }
 
 $registry->unregister('isSecureArea');