MC-18948: Switch default search engine from MySQL to ElasticSearch

- fixing integration tests

Author: cpartica

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php

@@ -85,7 +85,6 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/products_with_not_empty_layered_navigation_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider productListSortOrderDataProvider
      * @param string $sortBy
      * @param string $direction
@@ -101,7 +100,6 @@ public function testProductListSortOrder(string $sortBy, string $direction, arra
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/products_with_not_empty_layered_navigation_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider productListSortOrderDataProvider
      * @param string $sortBy
      * @param string $direction
@@ -174,7 +172,6 @@ public function productListSortOrderDataProvider(): array
     /**
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/Catalog/_files/products_with_not_empty_layered_navigation_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider productListSortOrderDataProviderOnStoreView
      * @param string $sortBy
      * @param string $direction
@@ -198,7 +195,6 @@ public function testProductListSortOrderOnStoreView(
     /**
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/Catalog/_files/products_with_not_empty_layered_navigation_attribute.php
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider productListSortOrderDataProviderOnStoreView
      * @param string $sortBy
      * @param string $direction

dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php

@@ -81,7 +81,6 @@ public function getRangeItemCountsDataProvider()
     /**
      * @magentoDataFixture Magento/Catalog/_files/categories.php
      * @magentoDbIsolation disabled
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider getRangeItemCountsDataProvider
      */
     public function testGetRangeItemCounts($inputRange, $expectedItemCounts)

dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmAdvancedTest.php

@@ -17,7 +17,6 @@ class AlgorithmAdvancedTest extends \PHPUnit\Framework\TestCase
      * @magentoDataFixture Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced.php
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @covers \Magento\Framework\Search\Dynamic\Algorithm::calculateSeparators
      */
     public function testWithoutLimits()
@@ -90,7 +89,6 @@ protected function _prepareFilter($layer, $priceResource, $request = null)
      * @magentoDataFixture Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced.php
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @covers \Magento\Framework\Search\Dynamic\Algorithm::calculateSeparators
      */
     public function testWithLimits()

dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/AlgorithmBaseTest.php

@@ -38,7 +38,6 @@ class AlgorithmBaseTest extends \PHPUnit\Framework\TestCase
     /**
      * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider pricesSegmentationDataProvider
      * @covers       \Magento\Framework\Search\Dynamic\Algorithm::calculateSeparators
      */

dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Result/IndexTest.php

@@ -20,7 +20,6 @@ class IndexTest extends AbstractController
     /**
      * Quick search test by difference product attributes.
      *
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search.php
      * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php

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

@@ -20,6 +20,10 @@
  */
 class FullTest extends \PHPUnit\Framework\TestCase
 {
+    protected function setUp()
+    {
+        $this->markTestSkipped("MC-18948: Mysql Search Engine is deprecated");
+    }
     /**
      * Testing fulltext index rebuild
      *

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php

@@ -11,6 +11,11 @@
  */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
+    protected function setUp()
+    {
+        $this->markTestSkipped("MC-18948: Mysql Search Engine is deprecated");
+    }
+
     /**
      * @dataProvider filtersDataProviderSearch
      * @magentoDataFixture Magento/Framework/Search/_files/products.php

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/AttributeSearchWeightTest.php

@@ -62,7 +62,6 @@ protected function tearDown()
     /**
      * Perform search by word and check founded product order in different cases.
      *
-     * @magentoConfigFixture default/catalog/search/engine mysql
      * @magentoDataFixture Magento/CatalogSearch/_files/products_for_sku_search_weight_score.php
      * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
      * @dataProvider attributeSearchWeightDataProvider

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/QuickSearchTest.php

@@ -55,8 +55,6 @@ protected function setUp()
     /**
      * Assert that configurable child products has not found by query using mysql search engine.
      *
-     * @magentoConfigFixture default/catalog/search/engine mysql
-     *
      * @return void
      */
     public function testChildProductsHasNotFoundedByQuery(): void

dev/tests/integration/testsuite/Magento/Elasticsearch/SearchAdapter/AdapterTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Elasticsearch\SearchAdapter;
 
 use Magento\Framework\Search\EngineResolverInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestModuleCatalogSearch\Model\ElasticsearchVersionChecker;
 
 /**
@@ -30,6 +31,33 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
      */
     protected $searchEngine;
 
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        /** @var \Magento\Framework\Search\Request\Config\Converter $converter */
+        $converter = $this->objectManager->create(\Magento\Framework\Search\Request\Config\Converter::class);
+
+        $document = new \DOMDocument();
+        $document->load($this->getRequestConfigPath());
+        $requestConfig = $converter->convert($document);
+
+        /** @var \Magento\Framework\Search\Request\Config $config */
+        $config = $this->objectManager->create(\Magento\Framework\Search\Request\Config::class);
+        $config->merge($requestConfig);
+
+        $this->requestBuilder = $this->objectManager->create(
+            \Magento\Framework\Search\Request\Builder::class,
+            ['config' => $config]
+        );
+
+        $this->adapter = $this->createAdapter();
+
+        $indexer = $this->objectManager->create(\Magento\Indexer\Model\Indexer::class);
+        $indexer->load('catalogsearch_fulltext');
+        $indexer->reindexAll();
+    }
+
     /**
      * Get request config path
      *