Migration of Elasticsearch Integration from Magento Commerce to Magento Open Source

Author: vrann

dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Client/ElasticsearchTest.php

@@ -95,7 +95,7 @@ private function search($text)
     }
 
     /**
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch5
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
      */
     public function testSearchConfigurableProductBySimpleProductName()

dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/IndexHandlerTest.php

@@ -111,7 +111,7 @@ protected function setUp()
 
     /**
      * Test reindex process
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      */
     public function testReindexAll()
@@ -128,7 +128,7 @@ public function testReindexAll()
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      */
     public function testReindexRowAfterEdit()
@@ -156,7 +156,7 @@ public function testReindexRowAfterEdit()
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      */
     public function testReindexRowAfterMassAction()
@@ -196,7 +196,7 @@ public function testReindexRowAfterMassAction()
     }
 
     /**
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
      * @magentoAppArea adminhtml
      */

dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php

@@ -68,7 +68,7 @@ protected function setUp()
     /**
      * Test search of all products after full reindex
      *
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
      */
@@ -82,7 +82,7 @@ public function testSearchAll()
     /**
      * Test search of specific product after full reindex
      *
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
      * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
      */

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

@@ -48,7 +48,7 @@ protected function createAdapter()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchQuery()
@@ -58,7 +58,7 @@ public function testMatchQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchOrderedQuery()
@@ -70,7 +70,7 @@ public function testMatchOrderedQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAggregationsQuery()
@@ -80,7 +80,7 @@ public function testAggregationsQuery()
 
     /**
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testMatchQueryFilters()
@@ -92,7 +92,7 @@ public function testMatchQueryFilters()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithAllFields()
@@ -104,7 +104,7 @@ public function testRangeFilterWithAllFields()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithoutFromField()
@@ -116,7 +116,7 @@ public function testRangeFilterWithoutFromField()
      * Range filter test with all fields filled
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testRangeFilterWithoutToField()
@@ -128,7 +128,7 @@ public function testRangeFilterWithoutToField()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testTermFilter()
@@ -140,7 +140,7 @@ public function testTermFilter()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testTermFilterArray()
@@ -152,7 +152,7 @@ public function testTermFilterArray()
      * Term filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testWildcardFilter()
@@ -164,7 +164,7 @@ public function testWildcardFilter()
      * Request limits test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testSearchLimit()
@@ -176,7 +176,7 @@ public function testSearchLimit()
      * Bool filter test
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilter()
@@ -188,7 +188,7 @@ public function testBoolFilter()
      * Test bool filter with nested negative bool filter
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilterWithNestedNegativeBoolFilter()
@@ -200,7 +200,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter()
      * Test range inside nested negative bool filter
      *
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
@@ -213,7 +213,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
      *
      * @dataProvider elasticSearchAdvancedSearchDataProvider
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @param string $nameQuery
      * @param string $descriptionQuery
@@ -259,7 +259,7 @@ public function elasticSearchAdvancedSearchDataProvider()
     /**
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testCustomFilterableAttribute()
@@ -274,7 +274,7 @@ public function testCustomFilterableAttribute()
      *
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Framework/Search/_files/filterable_attributes.php
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @dataProvider filterByAttributeValuesDataProvider
      * @param string $requestName
@@ -294,7 +294,7 @@ public function testFilterByAttributeValues($requestName, $additionalData)
      * @param $rangeFilter
      * @param $expectedRecordsCount
      * @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      * @magentoAppIsolation enabled
      * @dataProvider dateDataProvider
@@ -309,7 +309,7 @@ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount)
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAdvancedSearchCompositeProductWithOutOfStockOption()
@@ -321,7 +321,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_disabled_child.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testAdvancedSearchCompositeProductWithDisabledChild()
@@ -335,7 +335,7 @@ public function testAdvancedSearchCompositeProductWithDisabledChild()
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/search_weight_products.php
      * @magentoAppIsolation enabled
-     * @magentoConfigFixture current_store catalog/search/engine elasticsearch
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch
      * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
      */
     public function testSearchQueryBoost()