MC-15959: Implement caching for url resolver

- refactor test

Author: cpartica

dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Cms/CmsPageCacheTest.php

@@ -11,6 +11,7 @@
 use Magento\Cms\Model\PageRepository;
 use Magento\GraphQl\Controller\GraphQl;
 use Magento\GraphQlCache\Controller\AbstractGraphqlCacheTest;
+use Magento\Tests\NamingConvention\true\string;
 
 /**
  * Test caching works for CMS page
@@ -49,37 +50,8 @@ public function testToCheckCmsPageRequestCacheTags(): void
         $cmsPageBlank = $this->objectManager->get(GetPageByIdentifier::class)->execute('page_design_blank', 0);
         $pageIdBlank = $cmsPageBlank->getId();
 
-        $queryCmsPage100 =
-            <<<QUERY
-        {
-         cmsPage(id: $pageId100) {
-                   url_key
-                   title
-                   content
-                   content_heading
-                   page_layout
-                   meta_title
-                   meta_description
-                   meta_keywords
-                   }
-         }
-QUERY;
-
-        $queryCmsPageBlank =
-            <<<QUERY
-        {
-         cmsPage(id: $pageIdBlank) {
-                   url_key
-                   title
-                   content
-                   content_heading
-                   page_layout
-                   meta_title
-                   meta_description
-                   meta_keywords
-                   }
-         }
-QUERY;
+        $queryCmsPage100 = $this->getQuery($pageId100);
+        $queryCmsPageBlank = $this->getQuery($pageIdBlank);
 
         // check to see that the first entity gets a MISS when called the first time
         $request = $this->prepareRequest($queryCmsPage100);
@@ -129,7 +101,6 @@ public function testToCheckCmsPageRequestCacheTags(): void
         $expectedCacheTags = ['cms_p', 'cms_p_' .$pageIdBlank , 'FPC'];
         $this->assertEquals($expectedCacheTags, $requestedCacheTags);
 
-
         /** @var PageRepository $pageRepository */
         $pageRepository = $this->objectManager->get(PageRepository::class);
 
@@ -161,4 +132,29 @@ public function testToCheckCmsPageRequestCacheTags(): void
         $expectedCacheTags = ['cms_p', 'cms_p_' .$pageId100 , 'FPC'];
         $this->assertEquals($expectedCacheTags, $requestedCacheTags);
     }
+
+    /**
+     * Get cms query
+     *
+     * @param string $id
+     * @return string
+     */
+    private function getQuery(string $id) : string
+    {
+        $queryCmsPage = <<<QUERY
+        {
+         cmsPage(id: $id) {
+                   url_key
+                   title
+                   content
+                   content_heading
+                   page_layout
+                   meta_title
+                   meta_description
+                   meta_keywords
+                   }
+         }
+QUERY;
+        return $queryCmsPage;
+    }
 }

dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/UrlRewrite/AllEntitiesUrlResolverCacheTest.php

@@ -64,49 +64,18 @@ public function testAllEntitiesUrlResolverRequestHasCorrectTags()
             ]
         );
         $categoryId = $actualUrls->getEntityId();
-        $categoryQuery
-            = <<<QUERY
-{
-  urlResolver(url:"{$categoryUrlKey}")
-  {
-   id
-   relative_url,
-   canonical_url
-   type
-  }
-}
-QUERY;
+        $categoryQuery = $this->getQuery($categoryUrlKey);
 
-        $productQuery = <<<QUERY
-{
-  urlResolver(url:"{$productUrlKey}")
-  {
-   id
-   relative_url
-   canonical_url
-   type
-  }
-}
-QUERY;
+        $productQuery = $this->getQuery($productUrlKey);
 
         /** @var GetPageByIdentifierInterface $page */
         $page = $this->objectManager->get(GetPageByIdentifierInterface::class);
         /** @var PageInterface $cmsPage */
         $cmsPage = $page->execute('page100', 0);
         $cmsPageId = $cmsPage->getId();
         $requestPath = $cmsPage->getIdentifier();
-        $pageQuery
-            = <<<QUERY
-{
-  urlResolver(url:"{$requestPath}")
-  {
-   id
-   relative_url
-   canonical_url
-   type
-  }
-}
-QUERY;
+        $pageQuery = $this->getQuery($requestPath);
+
         // query category for MISS
         $request = $this->prepareRequest($categoryQuery);
         $response = $this->graphqlController->dispatch($request);
@@ -163,17 +132,7 @@ public function testAllEntitiesUrlResolverRequestHasCorrectTags()
 
         $product->setUrlKey('something-else-that-invalidates-the-cache');
         $productRepository->save($product);
-        $productQuery = <<<QUERY
-{
-  urlResolver(url:"something-else-that-invalidates-the-cache.html")
-  {
-   id
-   relative_url
-   canonical_url
-   type
-  }
-}
-QUERY;
+        $productQuery = $this->getQuery('something-else-that-invalidates-the-cache.html');
 
         // query category for MISS
         $request = $this->prepareRequest($categoryQuery);
@@ -193,4 +152,26 @@ public function testAllEntitiesUrlResolverRequestHasCorrectTags()
         $actualCacheTags = explode(',', $rawActualCacheTags);
         $this->assertEquals($expectedCacheTags, $actualCacheTags);
     }
+
+    /**
+     * Get urlResolver query
+     *
+     * @param string $id
+     * @return string
+     */
+    private function getQuery(string $requestPath) : string
+    {
+        $resolverQuery = <<<QUERY
+{
+  urlResolver(url:"{$requestPath}")
+  {
+   id
+   relative_url
+   canonical_url
+   type
+  }
+}
+QUERY;
+        return $resolverQuery;
+    }
 }