Merge remote-tracking branch 'arcticfoxes/MC-21520' into 2.3-develop-pr

Author: Joan He

dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/FullTest.php

@@ -11,6 +11,8 @@
 use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
 use Magento\Catalog\Model\Indexer\Product\Flat\State;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
@@ -35,6 +37,22 @@ class FullTest extends \Magento\TestFramework\Indexer\TestCase
      */
     private $objectManager;
 
+    /**
+     * @inheritdoc
+     */
+    public static function setUpBeforeClass()
+    {
+        /*
+         * Due to insufficient search engine isolation for Elasticsearch, this class must explicitly perform
+         * a fulltext reindex prior to running its tests.
+         *
+         * This should be removed upon completing MC-19455.
+         */
+        $indexRegistry = Bootstrap::getObjectManager()->get(IndexerRegistry::class);
+        $fulltextIndexer = $indexRegistry->get(Fulltext::INDEXER_ID);
+        $fulltextIndexer->reindexAll();
+    }
+
     /**
      * @inheritdoc
      */

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProviderTest.php

@@ -7,38 +7,71 @@
 
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Action;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductRepository as ProductRepository;
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Framework\Api\Search\Document as SearchDocument;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Search\AdapterInterface as AdapterInterface;
+use Magento\Framework\Search\Request\Builder as SearchRequestBuilder;
+use Magento\Framework\Search\Request\Config as SearchRequestConfig;
+use Magento\Search\Model\AdapterFactory as AdapterFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
 class DataProviderTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @inheritdoc
+     */
+    public static function setUpBeforeClass()
+    {
+        /*
+         * Due to insufficient search engine isolation for Elasticsearch, this class must explicitly perform
+         * a fulltext reindex prior to running its tests.
+         *
+         * This should be removed upon completing MC-19455.
+         */
+        $indexRegistry = Bootstrap::getObjectManager()->get(IndexerRegistry::class);
+        $fulltextIndexer = $indexRegistry->get(Fulltext::INDEXER_ID);
+        $fulltextIndexer->reindexAll();
+    }
+
     /**
      * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search.php
      * @magentoDbIsolation disabled
      */
     public function testSearchProductByAttribute()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        /** @var ObjectManager $objectManager */
+        $objectManager = Bootstrap::getObjectManager();
+
+        /** @var SearchRequestConfig $config */
+        $config = $objectManager->create(SearchRequestConfig::class);
 
-        $config = $objectManager->create(\Magento\Framework\Search\Request\Config::class);
-        /** @var \Magento\Framework\Search\Request\Builder $requestBuilder */
+        /** @var SearchRequestBuilder $requestBuilder */
         $requestBuilder = $objectManager->create(
-            \Magento\Framework\Search\Request\Builder::class,
+            SearchRequestBuilder::class,
             ['config' => $config]
         );
+
         $requestBuilder->bind('search_term', 'VALUE1');
         $requestBuilder->setRequestName('quick_search_container');
         $queryRequest = $requestBuilder->create();
-        /** @var \Magento\Framework\Search\Adapter\Mysql\Adapter $adapter */
-        $adapterFactory = $objectManager->create(\Magento\Search\Model\AdapterFactory::class);
+
+        /** @var AdapterInterface $adapter */
+        $adapterFactory = $objectManager->create(AdapterFactory::class);
         $adapter = $adapterFactory->create();
         $queryResponse = $adapter->query($queryRequest);
         $actualIds = [];
+
         foreach ($queryResponse as $document) {
-            /** @var \Magento\Framework\Api\Search\Document $document */
+            /** @var SearchDocument $document */
             $actualIds[] = $document->getId();
         }
 
-        /** @var \Magento\Catalog\Model\Product $product */
-        $product = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple');
+        /** @var Product $product */
+        $product = $objectManager->create(ProductRepository::class)->get('simple');
         $this->assertContains($product->getId(), $actualIds, 'Product not found by searchable attribute.');
     }
 }