MC-17875: Refactor GraphQl Integration tests

- code review comments

Author: dthampy

dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/PlaceOrderWithAuthorizeNetTest.php

@@ -16,9 +16,7 @@
 use Magento\Framework\HTTP\ZendClientFactory;
 use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-use Magento\Payment\Gateway\Data\PaymentDataObjectFactory;
 use PHPUnit\Framework\MockObject\MockObject;
-use Magento\Quote\Model\Quote\PaymentFactory;
 use PHPUnit\Framework\TestCase;
 use Zend_Http_Response;
 
@@ -27,14 +25,13 @@
  *
  * @magentoAppArea graphql
  * @magentoDbIsolation disabled
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PlaceOrderWithAuthorizeNetTest extends TestCase
 {
-    /** @var  ObjectManager */
+    /** @var ObjectManager */
     private $objectManager;
 
-    /** @var  GetMaskedQuoteIdByReservedOrderId */
+    /** @var GetMaskedQuoteIdByReservedOrderId */
     private $getMaskedQuoteIdByReservedOrderId;
 
     /** @var SerializerInterface */
@@ -46,15 +43,12 @@ class PlaceOrderWithAuthorizeNetTest extends TestCase
     /** @var ZendClient|MockObject|InvocationMocker */
     private $clientMock;
 
-    /** @var  CustomerTokenServiceInterface */
+    /** @var CustomerTokenServiceInterface */
     private $customerTokenService;
 
     /** @var Zend_Http_Response */
     protected $responseMock;
 
-    /** @var  PaymentFactory */
-    private $paymentFactory;
-
     protected function setUp() : void
     {
         $this->objectManager = Bootstrap::getObjectManager();
@@ -71,8 +65,6 @@ protected function setUp() : void
         $clientFactoryMock = $this->createMock(ZendClientFactory::class);
         $clientFactoryMock->method('create')
             ->willReturn($this->clientMock);
-        /** @var PaymentDataObjectFactory $paymentFactory */
-        $this->paymentFactory = $this->objectManager->get(PaymentDataObjectFactory::class);
         $this->objectManager->addSharedInstance($clientFactoryMock, ZendClientFactory::class);
     }
 

dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Customer/SetAuthorizeNetPaymentMethodOnCartTest.php

@@ -26,13 +26,13 @@ class SetAuthorizeNetPaymentMethodOnCartTest extends TestCase
     /** @var \Magento\Framework\ObjectManagerInterface */
     private $objectManager;
 
-    /** @var  GetMaskedQuoteIdByReservedOrderId */
+    /** @var GetMaskedQuoteIdByReservedOrderId */
     private $getMaskedQuoteIdByReservedOrderId;
 
     /** @var SerializerInterface */
     private $jsonSerializer;
 
-    /** @var  CustomerTokenServiceInterface */
+    /** @var CustomerTokenServiceInterface */
     private $customerTokenService;
 
     /** @var GraphQlRequest */

dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/PlaceOrderWithAuthorizeNetTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\AuthorizenetGraphQl\Model\Resolver\Guest;
 
-use Magento\Framework\App\Request\Http;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\GraphQl\Service\GraphQlRequest;
@@ -16,9 +15,7 @@
 use Magento\Framework\HTTP\ZendClientFactory;
 use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
-use Magento\Payment\Gateway\Data\PaymentDataObjectFactory;
 use PHPUnit\Framework\MockObject\MockObject;
-use Magento\Quote\Model\Quote\PaymentFactory;
 use PHPUnit\Framework\TestCase;
 use Zend_Http_Response;
 
@@ -27,14 +24,13 @@
  *
  * @magentoAppArea graphql
  * @magentoDbIsolation disabled
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PlaceOrderWithAuthorizeNetTest extends TestCase
 {
-    /** @var  ObjectManager */
+    /** @var ObjectManager */
     private $objectManager;
 
-    /** @var  GetMaskedQuoteIdByReservedOrderId */
+    /** @var GetMaskedQuoteIdByReservedOrderId */
     private $getMaskedQuoteIdByReservedOrderId;
 
     /** @var SerializerInterface */
@@ -49,15 +45,10 @@ class PlaceOrderWithAuthorizeNetTest extends TestCase
     /** @var Zend_Http_Response */
     protected $responseMock;
 
-    /** @var  PaymentFactory */
-    private $paymentFactory;
-
     protected function setUp() : void
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->graphql = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
         $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
-        $this->request = $this->objectManager->get(Http::class);
         $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
         $this->clientMock = $this->createMock(ZendClient::class);
@@ -69,8 +60,6 @@ protected function setUp() : void
         $clientFactoryMock = $this->createMock(ZendClientFactory::class);
         $clientFactoryMock->method('create')
             ->willReturn($this->clientMock);
-        /** @var PaymentDataObjectFactory $paymentFactory */
-        $this->paymentFactory = $this->objectManager->get(PaymentDataObjectFactory::class);
         $this->objectManager->addSharedInstance($clientFactoryMock, ZendClientFactory::class);
     }
 

dev/tests/integration/testsuite/Magento/AuthorizenetGraphQl/Model/Resolver/Guest/SetAuthorizeNetPaymentMethodOnCartTest.php

@@ -26,7 +26,7 @@ class SetAuthorizeNetPaymentMethodOnCartTest extends TestCase
     /** @var ObjectManager */
     private $objectManager;
 
-    /** @var  GetMaskedQuoteIdByReservedOrderId */
+    /** @var GetMaskedQuoteIdByReservedOrderId */
     private $getMaskedQuoteIdByReservedOrderId;
 
     /** @var SerializerInterface */

dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressSetPaymentMethodTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\PaypalGraphQl\Model\Resolver\Customer;
 
-use Magento\GraphQl\Service\GraphQlRequest;
 use Magento\Paypal\Model\Api\Nvp;
 use Magento\PaypalGraphQl\PaypalExpressAbstractTest;
 use Magento\Framework\Serialize\SerializerInterface;
@@ -21,11 +20,6 @@
  */
 class PaypalExpressSetPaymentMethodTest extends PaypalExpressAbstractTest
 {
-    /**
-     * @var GraphQlRequest
-     */
-    private $graphQlRequest;
-
     /**
      * @var SerializerInterface
      */
@@ -42,7 +36,6 @@ protected function setUp()
 
         $this->json = $this->objectManager->get(SerializerInterface::class);
         $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
     }
 
     /**

dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PaypalExpressTokenTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\PaypalGraphQl\Model\Resolver\Customer;
 
-use Magento\GraphQl\Service\GraphQlRequest;
 use Magento\Paypal\Model\Api\Nvp;
 use Magento\PaypalGraphQl\PaypalExpressAbstractTest;
 use Magento\Framework\Serialize\SerializerInterface;
@@ -20,11 +19,6 @@
  */
 class PaypalExpressTokenTest extends PaypalExpressAbstractTest
 {
-    /**
-     * @var GraphQlRequest
-     */
-    private $graphQlRequest;
-
     /**
      * @var SerializerInterface
      */
@@ -41,7 +35,6 @@ protected function setUp()
 
         $this->json = $this->objectManager->get(SerializerInterface::class);
         $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
     }
 
     /**

dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\PaypalGraphQl\Model\Resolver\Customer;
 
-use Magento\GraphQl\Service\GraphQlRequest;
 use Magento\PaypalGraphQl\PaypalPayflowProAbstractTest;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
@@ -21,11 +20,6 @@
  */
 class PlaceOrderWithPayflowProTest extends PaypalPayflowProAbstractTest
 {
-    /**
-     * @var GraphQlRequest
-     */
-    private $graphQlRequest;
-
     /**
      * @var SerializerInterface
      */
@@ -42,13 +36,13 @@ protected function setUp()
 
         $this->json = $this->objectManager->get(SerializerInterface::class);
         $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
     }
 
     /**
      * Test end to end test to process a paypal payflow pro order
      *
      * @return void
+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php

dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressSetPaymentMethodTest.php

@@ -7,13 +7,10 @@
 
 namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
 
-use Magento\Framework\App\Request\Http;
-use Magento\GraphQl\Service\GraphQlRequest;
 use Magento\Paypal\Model\Api\Nvp;
 use Magento\PaypalGraphQl\PaypalExpressAbstractTest;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\UrlInterface;
 
 /**
@@ -23,11 +20,6 @@
  */
 class PaypalExpressSetPaymentMethodTest extends PaypalExpressAbstractTest
 {
-    /**
-     * @var GraphQlRequest
-     */
-    private $graphQlRequest;
-
     /**
      * @var SerializerInterface
      */
@@ -44,7 +36,6 @@ protected function setUp()
 
         $this->json = $this->objectManager->get(SerializerInterface::class);
         $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
     }
 
     /**
@@ -53,6 +44,7 @@ protected function setUp()
      * @param string $paymentMethod
      * @return void
      * @dataProvider getPaypalCodesProvider
+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
      * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
      * @magentoDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php

dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalExpressTokenTest.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\GraphQl\Service\GraphQlRequest;
 use Magento\Paypal\Model\Api\Nvp;
 use Magento\PaypalGraphQl\PaypalExpressAbstractTest;
 use Magento\Framework\Serialize\SerializerInterface;
@@ -22,11 +21,6 @@
  */
 class PaypalExpressTokenTest extends PaypalExpressAbstractTest
 {
-    /**
-     * @var  GraphQlRequest
-     */
-    private $graphQlRequest;
-
     /**
      * @var SerializerInterface
      */
@@ -43,7 +37,6 @@ protected function setUp()
 
         $this->json = $this->objectManager->get(SerializerInterface::class);
         $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
     }
 
     /**

dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PaypalPayflowProSetPaymentMethodTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\PaypalGraphQl\Model\Resolver\Guest;
 
-use Magento\GraphQl\Service\GraphQlRequest;
 use Magento\PaypalGraphQl\PaypalPayflowProAbstractTest;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
@@ -21,11 +20,6 @@
  */
 class PaypalPayflowProSetPaymentMethodTest extends PaypalPayflowProAbstractTest
 {
-    /**
-     * @var GraphQlRequest
-     */
-    private $graphQlRequest;
-
     /**
      * @var SerializerInterface
      */
@@ -42,7 +36,6 @@ protected function setUp()
 
         $this->json = $this->objectManager->get(SerializerInterface::class);
         $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
-        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
     }
 
     /**