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

- skip tests

Author: cpartica

app/code/Magento/CatalogSearch/Model/Advanced/ProductCollectionPrepareStrategyProvider.php

@@ -6,6 +6,7 @@
 namespace Magento\CatalogSearch\Model\Advanced;
 
 use Magento\Framework\Search\EngineResolverInterface;
+use Magento\Framework\Exception\RuntimeException;
 
 /**
  * Strategy provider for preparing product collection.
@@ -38,15 +39,15 @@ public function __construct(
      * Get strategy provider for product collection prepare process.
      *
      * @return ProductCollectionPrepareStrategyInterface
-     * @throws \Exception
+     * @throws RuntimeException
      */
     public function getStrategy(): ProductCollectionPrepareStrategyInterface
     {
         if (!isset($this->strategies[$this->engineResolver->getCurrentSearchEngine()])) {
             if ($this->strategies['default']) {
                 return $this->strategies['default'];
             } else {
-                throw new \Exception('Default product collection strategy not found');
+                throw new RuntimeException(__('Default product collection strategy not found'));
             }
         }
         return $this->strategies[$this->engineResolver->getCurrentSearchEngine()];

app/code/Magento/Search/Model/EngineResolver.php

@@ -8,6 +8,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Search\EngineResolverInterface;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Exception\RuntimeException;
 
 /**
  * Search engine resolver model.
@@ -91,7 +92,7 @@ public function __construct(
      * It returns string identifier of Search Engine that is currently chosen in configuration
      *
      * @return string
-     * @throws \Exception
+     * @throws RuntimeException
      * @since 100.1.0
      */
     public function getCurrentSearchEngine()
@@ -109,13 +110,13 @@ public function getCurrentSearchEngine()
             $defaultEngine = $this->scopeConfig->getValue(
                 $this->path
             );
-            if ($defaultEngine) {
+            if (in_array($defaultEngine, $this->engines)) {
                 $this->logger->error(
                     $engine . ' search engine doesn\'t exist. Falling back to ' . $defaultEngine
                 );
                 return $defaultEngine;
             } else {
-                throw new \Exception($engine . ' search engine doesn\'t exist');
+                throw new RuntimeException(__('"%1" search engine doesn\'t exist', $engine));
             }
         }
     }

app/code/Magento/Search/Test/Unit/Model/EngineResolverTest.php

@@ -62,7 +62,7 @@ protected function setUp()
         $this->path = 'catalog/search/engine';
         $this->scopeType = 'default';
         $this->scopeCode = null;
-        $this->engines = [EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE, 'anotherengine'];
+        $this->engines = ['defaultentengine', 'anotherengine'];
 
         $this->model = new EngineResolver(
             $this->scopeConfig,
@@ -91,21 +91,40 @@ public function testGetCurrentSearchEngine()
     /**
      * Test getCurrentSearchEngine
      */
-    public function testGetCurrentSearchEngineWithoutEngine()
+    public function testGetCurrentSearchEngineDefaultEngine()
     {
         $engine = 'nonexistentengine';
+        $defaultEngine = 'defaultentengine';
 
-        $this->scopeConfig->expects($this->any())
+        $this->scopeConfig->expects($this->at(0))
             ->method('getValue')
             ->willReturn($engine);
 
+        $this->scopeConfig->expects($this->at(1))
+            ->method('getValue')
+            ->willReturn($defaultEngine);
+
         $this->loggerMock->expects($this->any())
             ->method('error')
             ->with(
-                $engine . ' search engine doesn\'t exists. Falling back to '
-                . EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE
+                "{$engine} search engine doesn't exist. Falling back to {$defaultEngine}"
             );
 
-        $this->assertEquals(EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE, $this->model->getCurrentSearchEngine());
+        $this->assertEquals($defaultEngine, $this->model->getCurrentSearchEngine());
+    }
+
+    /**
+     * Test getCurrentSearchEngine
+     * @expectedException \Exception
+     */
+    public function testGetCurrentSearchEngineWithoutEngine()
+    {
+        $engine = null;
+
+        $this->scopeConfig->expects($this->any())
+            ->method('getValue')
+            ->willReturn($engine);
+
+        $this->model->getCurrentSearchEngine();
     }
 }