Skip to content

Commit bb7d459

Browse files
joanhejoanhe
authored
Merge pull request #3875 from magento-engcom/1-es6-integration-tests
[EngCom] Elasticsearch 6 Support
2 parents 03428ba + e5661e1 commit bb7d459

File tree

6 files changed

+38
-41
lines changed

6 files changed

+38
-41
lines changed

‎.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ cache:
5454
- $HOME/node_modules
5555
- $HOME/yarn.lock
5656
before_install:
57-
- curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
5857
- ./dev/travis/before_install.sh
5958
install: composer install --no-interaction
6059
before_script: ./dev/travis/before_script.sh

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected function setUp()
4343
$contentManager = $this->getMockBuilder(\Magento\Elasticsearch\SearchAdapter\ConnectionManager::class)
4444
->disableOriginalConstructor()
4545
->getMock();
46-
$this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch\Model\Client\Elasticsearch::class)
46+
$this->clientMock = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Client\Elasticsearch::class)
4747
->disableOriginalConstructor()
4848
->getMock();
4949
$contentManager
@@ -78,7 +78,7 @@ protected function setUp()
7878

7979
/**
8080
* @magentoAppIsolation enabled
81-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
81+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
8282
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
8383
* @return void
8484
*/

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Magento\TestFramework\Helper\Bootstrap;
1111
use Magento\Store\Model\StoreManagerInterface;
1212
use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
13-
use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
13+
use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
1414
use Magento\Elasticsearch\Model\Config;
1515
use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
1616

@@ -95,7 +95,7 @@ private function search($text)
9595
}
9696

9797
/**
98-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
98+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
9999
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
100100
*/
101101
public function testSearchConfigurableProductBySimpleProductName()
@@ -104,7 +104,7 @@ public function testSearchConfigurableProductBySimpleProductName()
104104
}
105105

106106
/**
107-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
107+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
108108
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
109109
*/
110110
public function testSearchConfigurableProductBySimpleProductAttributeMultiselect()
@@ -113,7 +113,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeMultiselect
113113
}
114114

115115
/**
116-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
116+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
117117
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
118118
*/
119119
public function testSearchConfigurableProductBySimpleProductAttributeSelect()
@@ -122,7 +122,7 @@ public function testSearchConfigurableProductBySimpleProductAttributeSelect()
122122
}
123123

124124
/**
125-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
125+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
126126
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix composite_product_search
127127
*/
128128
public function testSearchConfigurableProductBySimpleProductAttributeShortDescription()

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
use Magento\TestFramework\Helper\Bootstrap;
1414
use Magento\Store\Model\StoreManagerInterface;
1515
use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
16-
use Magento\Elasticsearch\Model\Client\Elasticsearch as ElasticsearchClient;
16+
use Magento\Elasticsearch6\Model\Client\Elasticsearch as ElasticsearchClient;
1717
use Magento\Elasticsearch\Model\Config;
1818
use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
1919
use Magento\Indexer\Model\Indexer;
@@ -87,7 +87,7 @@ protected function setUp()
8787
}
8888

8989
/**
90-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
90+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
9191
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
9292
* @return void
9393
*/
@@ -106,7 +106,7 @@ public function testReindexAll(): void
106106

107107
/**
108108
* @magentoAppIsolation enabled
109-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
109+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
110110
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
111111
* @return void
112112
*/
@@ -131,7 +131,7 @@ public function testReindexRowAfterEdit(): void
131131
}
132132

133133
/**
134-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
134+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
135135
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
136136
* @return void
137137
*/
@@ -170,7 +170,7 @@ public function testReindexRowAfterMassAction(): void
170170
}
171171

172172
/**
173-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
173+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
174174
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
175175
* @magentoAppArea adminhtml
176176
* @return void
@@ -192,7 +192,7 @@ public function testReindexRowAfterDelete(): void
192192
/**
193193
* @magentoDbIsolation enabled
194194
* @magentoAppArea adminhtml
195-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
195+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
196196
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
197197
* @magentoDataFixture Magento/Elasticsearch/_files/configurable_products.php
198198
* @return void

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected function setUp()
6868
/**
6969
* Test search of all products after full reindex
7070
*
71-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
71+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
7272
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
7373
* @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
7474
*/
@@ -82,7 +82,7 @@ public function testSearchAll()
8282
/**
8383
* Test search of specific product after full reindex
8484
*
85-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
85+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
8686
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
8787
* @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
8888
*/

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

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*/
66
namespace Magento\Elasticsearch\SearchAdapter;
77

8-
use Magento\Elasticsearch\Model\Config;
9-
108
/**
119
* Class AdapterTest
1210
*
@@ -26,7 +24,7 @@ class AdapterTest extends \Magento\Framework\Search\Adapter\Mysql\AdapterTest
2624
/**
2725
* @var string
2826
*/
29-
protected $searchEngine = Config::ENGINE_NAME;
27+
protected $searchEngine = 'elasticsearch6';
3028

3129
/**
3230
* Get request config path
@@ -43,12 +41,12 @@ protected function getRequestConfigPath()
4341
*/
4442
protected function createAdapter()
4543
{
46-
return $this->objectManager->create(\Magento\Elasticsearch\SearchAdapter\Adapter::class);
44+
return $this->objectManager->create(\Magento\Elasticsearch\Elasticsearch5\SearchAdapter\Adapter::class);
4745
}
4846

4947
/**
5048
* @magentoAppIsolation enabled
51-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
49+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
5250
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
5351
*/
5452
public function testMatchQuery()
@@ -58,7 +56,7 @@ public function testMatchQuery()
5856

5957
/**
6058
* @magentoAppIsolation enabled
61-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
59+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
6260
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
6361
*/
6462
public function testMatchOrderedQuery()
@@ -70,7 +68,7 @@ public function testMatchOrderedQuery()
7068

7169
/**
7270
* @magentoAppIsolation enabled
73-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
71+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
7472
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
7573
*/
7674
public function testAggregationsQuery()
@@ -80,7 +78,7 @@ public function testAggregationsQuery()
8078

8179
/**
8280
* @magentoAppIsolation enabled
83-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
81+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
8482
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
8583
*/
8684
public function testMatchQueryFilters()
@@ -92,7 +90,7 @@ public function testMatchQueryFilters()
9290
* Range filter test with all fields filled
9391
*
9492
* @magentoAppIsolation enabled
95-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
93+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
9694
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
9795
*/
9896
public function testRangeFilterWithAllFields()
@@ -104,7 +102,7 @@ public function testRangeFilterWithAllFields()
104102
* Range filter test with all fields filled
105103
*
106104
* @magentoAppIsolation enabled
107-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
105+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
108106
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
109107
*/
110108
public function testRangeFilterWithoutFromField()
@@ -116,7 +114,7 @@ public function testRangeFilterWithoutFromField()
116114
* Range filter test with all fields filled
117115
*
118116
* @magentoAppIsolation enabled
119-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
117+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
120118
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
121119
*/
122120
public function testRangeFilterWithoutToField()
@@ -128,7 +126,7 @@ public function testRangeFilterWithoutToField()
128126
* Term filter test
129127
*
130128
* @magentoAppIsolation enabled
131-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
129+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
132130
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
133131
*/
134132
public function testTermFilter()
@@ -140,7 +138,7 @@ public function testTermFilter()
140138
* Term filter test
141139
*
142140
* @magentoAppIsolation enabled
143-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
141+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
144142
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
145143
*/
146144
public function testTermFilterArray()
@@ -152,7 +150,7 @@ public function testTermFilterArray()
152150
* Term filter test
153151
*
154152
* @magentoAppIsolation enabled
155-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
153+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
156154
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
157155
*/
158156
public function testWildcardFilter()
@@ -164,7 +162,7 @@ public function testWildcardFilter()
164162
* Request limits test
165163
*
166164
* @magentoAppIsolation enabled
167-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
165+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
168166
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
169167
*/
170168
public function testSearchLimit()
@@ -176,7 +174,7 @@ public function testSearchLimit()
176174
* Bool filter test
177175
*
178176
* @magentoAppIsolation enabled
179-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
177+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
180178
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
181179
*/
182180
public function testBoolFilter()
@@ -188,7 +186,7 @@ public function testBoolFilter()
188186
* Test bool filter with nested negative bool filter
189187
*
190188
* @magentoAppIsolation enabled
191-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
189+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
192190
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
193191
*/
194192
public function testBoolFilterWithNestedNegativeBoolFilter()
@@ -200,7 +198,7 @@ public function testBoolFilterWithNestedNegativeBoolFilter()
200198
* Test range inside nested negative bool filter
201199
*
202200
* @magentoAppIsolation enabled
203-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
201+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
204202
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
205203
*/
206204
public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
@@ -213,7 +211,7 @@ public function testBoolFilterWithNestedRangeInNegativeBoolFilter()
213211
*
214212
* @dataProvider elasticSearchAdvancedSearchDataProvider
215213
* @magentoAppIsolation enabled
216-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
214+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
217215
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
218216
* @param string $nameQuery
219217
* @param string $descriptionQuery
@@ -259,7 +257,7 @@ public function elasticSearchAdvancedSearchDataProvider()
259257
/**
260258
* @magentoAppIsolation enabled
261259
* @magentoDataFixture Magento/Framework/Search/_files/filterable_attribute.php
262-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
260+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
263261
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
264262
*/
265263
public function testCustomFilterableAttribute()
@@ -274,7 +272,7 @@ public function testCustomFilterableAttribute()
274272
*
275273
* @magentoAppIsolation enabled
276274
* @magentoDataFixture Magento/Framework/Search/_files/filterable_attributes.php
277-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
275+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
278276
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
279277
* @dataProvider filterByAttributeValuesDataProvider
280278
* @param string $requestName
@@ -294,7 +292,7 @@ public function testFilterByAttributeValues($requestName, $additionalData)
294292
* @param $rangeFilter
295293
* @param $expectedRecordsCount
296294
* @magentoDataFixture Magento/Framework/Search/_files/date_attribute.php
297-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
295+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
298296
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
299297
* @magentoAppIsolation enabled
300298
* @dataProvider dateDataProvider
@@ -309,7 +307,7 @@ public function testAdvancedSearchDateField($rangeFilter, $expectedRecordsCount)
309307
/**
310308
* @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
311309
* @magentoAppIsolation enabled
312-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
310+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
313311
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
314312
*/
315313
public function testAdvancedSearchCompositeProductWithOutOfStockOption()
@@ -320,7 +318,7 @@ public function testAdvancedSearchCompositeProductWithOutOfStockOption()
320318
/**
321319
* @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_disabled_child.php
322320
* @magentoAppIsolation enabled
323-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
321+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
324322
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
325323
*/
326324
public function testAdvancedSearchCompositeProductWithDisabledChild()
@@ -333,7 +331,7 @@ public function testAdvancedSearchCompositeProductWithDisabledChild()
333331
/**
334332
* @magentoDataFixture Magento/Framework/Search/_files/search_weight_products.php
335333
* @magentoAppIsolation enabled
336-
* @magentoConfigFixture default/catalog/search/engine elasticsearch
334+
* @magentoConfigFixture default/catalog/search/engine elasticsearch6
337335
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix adaptertest
338336
*/
339337
public function testSearchQueryBoost()

0 commit comments

Comments
 (0)