B2B-2659: Implement GraphQL Resolver Cache for cmsBlocks query

Author: danmooney2

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/ResolverCacheAbstract.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\TestCase\GraphQl;
+
+use Magento\Framework\App\Cache\StateInterface as CacheStateInterface;
+use Magento\GraphQlCache\Model\Cache\Query\Resolver\Result\Type as GraphQlResolverCache;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ResolverCacheAbstract extends GraphQlAbstract
+{
+    /**
+     * @var GraphQlResolverCache
+     */
+    private $graphQlResolverCache;
+
+    /**
+     * @var CacheStateInterface
+     */
+    private $cacheState;
+
+    /**
+     * @var bool
+     */
+    private $originalCacheStateEnabledStatus;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->cacheState = $objectManager->get(CacheStateInterface::class);
+        $this->originalCacheStateEnabledStatus = $this->cacheState->isEnabled(GraphQlResolverCache::TYPE_IDENTIFIER);
+        $this->cacheState->setEnabled(GraphQlResolverCache::TYPE_IDENTIFIER, true);
+        $this->graphQlResolverCache = $objectManager->get(GraphQlResolverCache::class);
+
+        parent::setUp();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        // clean graphql resolver cache and reset to original enablement status
+        $this->graphQlResolverCache->clean();
+        $this->cacheState->setEnabled(
+            GraphQlResolverCache::TYPE_IDENTIFIER,
+            $this->originalCacheStateEnabledStatus
+        );
+
+        parent::tearDown();
+    }
+}

dev/tests/api-functional/testsuite/Magento/GraphQl/CmsGraphQl/Model/Resolver/BlockTest.php

@@ -14,11 +14,11 @@
 use Magento\GraphQlCache\Model\CacheId\CacheIdCalculator;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQl\ResolverCacheAbstract;
 use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
-use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Widget\Model\Template\FilterEmulate;
 
-class BlockTest extends GraphQlAbstract
+class BlockTest extends ResolverCacheAbstract
 {
     /**
      * @var BlockRepositoryInterface
@@ -47,13 +47,8 @@ protected function setUp(): void
         $this->graphQlResolverCache = $objectManager->get(GraphQlResolverCache::class);
         $this->widgetFilter = $objectManager->get(FilterEmulate::class);
         $this->storeManager = $objectManager->get(StoreManagerInterface::class);
-    }
-
-    protected function tearDown(): void
-    {
-        $this->graphQlResolverCache->clean();
 
-        parent::tearDown();
+        parent::setUp();
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/GraphQl/CmsGraphQl/Model/Resolver/PageTest.php

@@ -12,19 +12,18 @@
 use Magento\Cms\Model\PageRepository;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Cache\Frontend\Factory as CacheFrontendFactory;
-use Magento\Framework\App\Cache\StateInterface as CacheState;
 use Magento\GraphQlCache\Model\Cache\Query\Resolver\Result\Type as GraphQlResolverCache;
 use Magento\GraphQlCache\Model\CacheId\CacheIdCalculator;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQl\ResolverCacheAbstract;
 use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
-use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class PageTest extends GraphQlAbstract
+class PageTest extends ResolverCacheAbstract
 {
     /**
      * @var GraphQlResolverCache
@@ -46,21 +45,11 @@ class PageTest extends GraphQlAbstract
      */
     private $customerTokenService;
 
-    /**
-     * @var CacheState
-     */
-    private $cacheState;
-
     /**
      * @var StoreManagerInterface
      */
     private $storeManager;
 
-    /**
-     * @var bool
-     */
-    private $originalCacheStateEnabledStatus;
-
     protected function setUp(): void
     {
         $objectManager = ObjectManager::getInstance();
@@ -71,21 +60,7 @@ protected function setUp(): void
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
         $this->storeManager = $objectManager->get(StoreManagerInterface::class);
 
-        $this->cacheState = $objectManager->get(CacheState::class);
-        $this->originalCacheStateEnabledStatus = $this->cacheState->isEnabled(GraphQlResolverCache::TYPE_IDENTIFIER);
-        $this->cacheState->setEnabled(GraphQlResolverCache::TYPE_IDENTIFIER, true);
-    }
-
-    protected function tearDown(): void
-    {
-        // clean graphql resolver cache and reset to original enablement status
-        $this->graphQlResolverCache->clean();
-        $this->cacheState->setEnabled(
-            GraphQlResolverCache::TYPE_IDENTIFIER,
-            $this->originalCacheStateEnabledStatus
-        );
-
-        parent::tearDown();
+        parent::setUp();
     }
 
     /**