Revert changes in Tests

Author: engcom-Kilo

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Catalog;
 
-use Magento\PageCache\Model\Cache\Type as PageCache;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -77,8 +76,6 @@ public function testProductFromSpecificAndDefaultStore()
             'Product name in fixture store is invalid.'
         );
 
-        $this->flushPageCache();
-
         //use case for default storeCode
         $nameInDefaultStore = 'Simple Product';
         $headerMapDefault = ['Store' => 'default'];
@@ -89,8 +86,6 @@ public function testProductFromSpecificAndDefaultStore()
             'Product name in default store is invalid.'
         );
 
-        $this->flushPageCache();
-
         //use case for empty storeCode
         $headerMapEmpty = ['Store' => ''];
         $response = $this->graphQlQuery($query, [], '', $headerMapEmpty);
@@ -100,20 +95,11 @@ public function testProductFromSpecificAndDefaultStore()
             'Product in the default store should be returned'
         );
 
-        $this->flushPageCache();
-
         // use case for invalid storeCode
         $nonExistingStoreCode = "non_existent_store";
         $headerMapInvalidStoreCode = ['Store' => $nonExistingStoreCode];
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('Requested store is not found');
         $this->graphQlQuery($query, [], '', $headerMapInvalidStoreCode);
     }
-
-    protected function flushPageCache(): void
-    {
-        /** @var PageCache $fullPageCache */
-        $fullPageCache = ObjectManager::getInstance()->get(PageCache::class);
-        $fullPageCache->clean();
-    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php

@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\PageCache;
 
-use Magento\PageCache\Model\Cache\Type as PageCache;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -243,8 +242,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code EUR in fixture ' . $storeCodeFromFixture . ' is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test cached store + currency header in Euros
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'EUR'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -259,8 +256,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code EUR in fixture ' . $storeCodeFromFixture . ' is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test non cached store + currency header in USD
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'USD'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -275,8 +270,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code USD in fixture ' . $storeCodeFromFixture . ' is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test non cached store + currency header in USD not cached
         $headerMap = ['Store' => 'default', 'Content-Currency' => 'USD'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -291,8 +284,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code USD in fixture store default is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test non cached store + currency header in USD not cached
         $headerMap = ['Store' => 'default', 'Content-Currency' => 'EUR'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -307,8 +298,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code EUR in fixture store default is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test non cached store + currency header in USD  cached
         $headerMap = ['Store' => 'default'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -323,21 +312,12 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code USD in fixture store default is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test cached response store + currency header with non existing currency, and no valid response, no cache
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
         $this->expectExceptionMessage(
             'GraphQL response contains errors: Please correct the target currency'
         );
-
         $this->graphQlQuery($query, [], '', $headerMap);
     }
 
-    protected function flushPageCache(): void
-    {
-        /** @var PageCache $fullPageCache */
-        $fullPageCache = ObjectManager::getInstance()->get(PageCache::class);
-        $fullPageCache->clean();
-    }
 }