Skip to content

Commit 51f2dab

Browse files
rganinrganin
committed
MC-18143: Adapt WebAPI to elasticsearch on CI
1 parent 61a5a30 commit 51f2dab

File tree

4 files changed

+95
-27
lines changed

4 files changed

+95
-27
lines changed

‎dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryMultiCurrencyTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class ProductRepositoryMultiCurrencyTest extends WebapiAbstract
1717
const WEBSITES_RESOURCE_PATH = '/V1/store/websites';
1818

1919
/**
20+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
2021
* @magentoApiDataFixture Magento/Store/_files/second_website_with_second_currency.php
2122
* @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
2223
*/

‎dev/tests/api-functional/testsuite/Magento/Framework/Api/Search/SearchTest.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testCatalogSearch()
3838
]
3939
]
4040
],
41-
'page_size' => 20000000000000,
41+
'page_size' => 999,
4242
'current_page' => 0,
4343
],
4444
];
@@ -66,7 +66,15 @@ public function testCatalogSearch()
6666
$this->assertTrue(count($response['items']) > 0);
6767

6868
$this->assertNotNull($response['items'][0]['id']);
69-
$this->assertEquals('score', $response['items'][0]['custom_attributes'][0]['attribute_code']);
69+
$this->assertTrue(
70+
in_array(
71+
$response['items'][0]['custom_attributes'][0]['attribute_code'],
72+
[
73+
'score', // mysql
74+
'_score' // elasticsearch score
75+
]
76+
)
77+
);
7078
$this->assertTrue($response['items'][0]['custom_attributes'][0]['value'] > 0);
7179
}
7280
}

‎dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php

Lines changed: 63 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Magento\Catalog\Model\Category;
1515
use Magento\Catalog\Model\CategoryLinkManagement;
1616
use Magento\Eav\Model\Config;
17-
use Magento\Indexer\Model\Indexer;
1817
use Magento\TestFramework\ObjectManager;
1918
use Magento\TestFramework\TestCase\GraphQlAbstract;
2019
use Magento\Catalog\Model\Product;
@@ -28,13 +27,16 @@
2827
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
2928
* @SuppressWarnings(PHPMD.ExcessiveClassLength)
3029
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
30+
* @SuppressWarnings(PHPMD.UnusedPrivateMethod)
31+
* //@todo remove included categories in fixtures and replace them with category fixture
3132
*/
3233
class ProductSearchTest extends GraphQlAbstract
3334
{
3435
/**
3536
* Verify that layered navigation filters and aggregations are correct for product query
3637
*
3738
* Filter products by an array of skus
39+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
3840
* @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
3941
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
4042
*/
@@ -84,17 +86,37 @@ public function testFilterLn()
8486
$response['products'],
8587
'Filters are missing in product query result.'
8688
);
89+
90+
$expectedFilters = $this->getExpectedFiltersDataSet();
91+
$actualFilters = $response['products']['filters'];
92+
// presort expected and actual results as different search engines have different orders
93+
usort($expectedFilters, [$this, 'compareFilterNames']);
94+
usort($actualFilters, [$this, 'compareFilterNames']);
95+
8796
$this->assertFilters(
88-
$response,
89-
$this->getExpectedFiltersDataSet(),
97+
['products' => ['filters' => $actualFilters]],
98+
$expectedFilters,
9099
'Returned filters data set does not match the expected value'
91100
);
92101
}
93102

103+
/**
104+
* Compare arrays by value in 'name' field.
105+
*
106+
* @param array $a
107+
* @param array $b
108+
* @return int
109+
*/
110+
private function compareFilterNames(array $a, array $b)
111+
{
112+
return strcmp($a['name'], $b['name']);
113+
}
114+
94115
/**
95116
* Layered navigation for Configurable products with out of stock options
96117
* Two configurable products each having two variations and one of the child products of one Configurable set to OOS
97118
*
119+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
98120
* @magentoApiDataFixture Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php
99121
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
100122
*/
@@ -199,6 +221,7 @@ private function getQueryProductsWithArrayOfCustomAttributes($attributeCode, $fi
199221
/**
200222
* Filter products by custom attribute of dropdown type and filterTypeInput eq
201223
*
224+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
202225
* @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
203226
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
204227
*/
@@ -305,15 +328,17 @@ public function testFilterProductsByDropDownCustomAttribute()
305328

306329
/**
307330
* @return void
331+
* @throws \Magento\Framework\Exception\LocalizedException
308332
*/
309333
private function reIndexAndCleanCache() : void
310334
{
311-
$objectManager = Bootstrap::getObjectManager();
312-
$indexer = $objectManager->create(Indexer::class);
313-
$indexer->load('catalogsearch_fulltext');
314-
$indexer->reindexAll();
335+
$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
336+
$out = '';
337+
// phpcs:ignore Magento2.Security.InsecureFunction
338+
exec("php -f {$appDir}/bin/magento indexer:reindex", $out);
315339
CacheCleaner::cleanAll();
316340
}
341+
317342
/**
318343
* Filter products using an array of multi select custom attributes
319344
*
@@ -410,6 +435,7 @@ private function getDefaultAttributeOptionValue(string $attributeCode) : string
410435
/**
411436
* Full text search for Products and then filter the results by custom attribute ( sort is by defaulty by relevance)
412437
*
438+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
413439
* @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
414440
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
415441
*/
@@ -557,6 +583,7 @@ public function testSearchAndFilterByCustomAttribute()
557583
/**
558584
* Filter by category and custom attribute
559585
*
586+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
560587
* @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
561588
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
562589
*/
@@ -676,9 +703,12 @@ public function testFilterByCategoryIdAndCustomAttribute()
676703
'value'=> '13'
677704
],
678705
];
706+
// presort expected and actual results as different search engines have different orders
707+
usort($expectedCategoryInAggregrations, [$this, 'compareLabels']);
708+
usort($actualCategoriesFromResponse, [$this, 'compareLabels']);
679709
$categoryInAggregations = array_map(null, $expectedCategoryInAggregrations, $actualCategoriesFromResponse);
680710

681-
//Validate the categories and sub-categories data in the filter layer
711+
//Validate the categories and sub-categories data in the filter layer
682712
foreach ($categoryInAggregations as $index => $categoryAggregationsData) {
683713
$this->assertNotEmpty($categoryAggregationsData);
684714
$this->assertEquals(
@@ -694,6 +724,18 @@ public function testFilterByCategoryIdAndCustomAttribute()
694724
}
695725
}
696726

727+
/**
728+
* Compare arrays by value in 'label' field.
729+
*
730+
* @param array $a
731+
* @param array $b
732+
* @return int
733+
*/
734+
private function compareLabels(array $a, array $b)
735+
{
736+
return strcmp($a['label'], $b['label']);
737+
}
738+
697739
/**
698740
* Filter by exact match of product url key
699741
*
@@ -982,6 +1024,7 @@ private function assertFilters($response, $expectedFilters, $message = '')
9821024
/**
9831025
* Verify product filtering using price range AND matching skus AND name sorted in DESC order
9841026
*
1027+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
9851028
* @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
9861029
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
9871030
*/
@@ -1052,13 +1095,14 @@ public function testFilterWithinSpecificPriceRangeSortedByNameDesc()
10521095
* expected - error is thrown
10531096
* Actual - empty array
10541097
*
1098+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
10551099
* @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
10561100
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
10571101
*/
10581102

10591103
public function testSearchWithFilterWithPageSizeEqualTotalCount()
10601104
{
1061-
1105+
$this->reIndexAndCleanCache();
10621106
$query
10631107
= <<<QUERY
10641108
{
@@ -1114,6 +1158,7 @@ public function testSearchWithFilterWithPageSizeEqualTotalCount()
11141158
/**
11151159
* Filtering for products and sorting using multiple sort parameters
11161160
*
1161+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
11171162
* @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
11181163
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
11191164
*/
@@ -1486,18 +1531,24 @@ public function testSearchAndSortByRelevance()
14861531
$this->assertEquals(3, $response['products']['total_count']);
14871532
$this->assertNotEmpty($response['products']['filters'], 'Filters should have the Category layer');
14881533
$this->assertEquals('Colorful Category', $response['products']['filters'][0]['filter_items'][0]['label']);
1534+
$this->assertCount(2, $response['products']['aggregations']);
14891535
$productsInResponse = ['Blue briefs','Navy Blue Striped Shoes','Grey shorts'];
1536+
/** @var \Magento\Config\Model\Config $config */
1537+
$config = Bootstrap::getObjectManager()->get(\Magento\Config\Model\Config::class);
1538+
if (strpos($config->getConfigDataValue('catalog/search/engine'), 'elasticsearch') !== false) {
1539+
$this->markTestIncomplete('MC-20716');
1540+
}
14901541
$count = count($response['products']['items']);
14911542
for ($i = 0; $i < $count; $i++) {
14921543
$this->assertEquals($productsInResponse[$i], $response['products']['items'][$i]['name']);
14931544
}
1494-
$this->assertCount(2, $response['products']['aggregations']);
14951545
}
14961546

14971547
/**
14981548
* Filtering for product with sku "equals" a specific value
14991549
* If pageSize and current page are not requested, default values are returned
15001550
*
1551+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
15011552
* @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
15021553
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
15031554
*/
@@ -1748,6 +1799,7 @@ public function testFilterWithinASpecificPriceRangeSortedByPriceDESC()
17481799
/**
17491800
* No items are returned if the conditions are not met
17501801
*
1802+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
17511803
* @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
17521804
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
17531805
*/
@@ -1807,6 +1859,7 @@ public function testQueryFilterNoMatchingItems()
18071859
/**
18081860
* Asserts that exception is thrown when current page > totalCount of items returned
18091861
*
1862+
* @magentoApiDataFixture Magento/Catalog/_files/category.php
18101863
* @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
18111864
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
18121865
*/

‎dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleMultiStoreTest.php

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Magento\WebapiAsync\Model;
1010

11-
use Magento\Catalog\Api\Data\ProductInterface;
11+
use Magento\Catalog\Api\Data\ProductInterface as Product;
1212
use Magento\TestFramework\MessageQueue\PreconditionFailedException;
1313
use Magento\TestFramework\MessageQueue\PublisherConsumerController;
1414
use Magento\TestFramework\MessageQueue\EnvironmentPreconditionException;
@@ -19,7 +19,6 @@
1919
use Magento\Framework\Registry;
2020
use Magento\Framework\Webapi\Exception;
2121
use Magento\Catalog\Api\ProductRepositoryInterface;
22-
use Magento\Catalog\Api\Data\ProductInterface as Product;
2322
use Magento\Framework\ObjectManagerInterface;
2423
use Magento\Store\Model\Store;
2524
use Magento\Framework\Webapi\Rest\Request;
@@ -128,6 +127,13 @@ protected function setUp()
128127
*/
129128
public function testAsyncScheduleBulkMultistore($storeCode)
130129
{
130+
if ($storeCode === self::STORE_CODE_FROM_FIXTURE) {
131+
/** @var \Magento\Config\Model\Config $config */
132+
$config = Bootstrap::getObjectManager()->get(\Magento\Config\Model\Config::class);
133+
if (strpos($config->getConfigDataValue('catalog/search/engine'), 'elasticsearch') !== false) {
134+
$this->markTestSkipped('MC-20452');
135+
}
136+
}
131137
$product = $this->getProductData();
132138
$this->_markTestAsRestOnly();
133139

@@ -277,9 +283,9 @@ public function getProductData()
277283
'product' =>
278284
$productBuilder(
279285
[
280-
ProductInterface::TYPE_ID => 'simple',
281-
ProductInterface::SKU => 'multistore-sku-test-1',
282-
ProductInterface::NAME => 'Test Name ',
286+
Product::TYPE_ID => 'simple',
287+
Product::SKU => 'multistore-sku-test-1',
288+
Product::NAME => 'Test Name ',
283289
]
284290
),
285291
];
@@ -303,16 +309,16 @@ public function storeProvider()
303309
private function getSimpleProductData($productData = [])
304310
{
305311
return [
306-
ProductInterface::SKU => isset($productData[ProductInterface::SKU])
307-
? $productData[ProductInterface::SKU] : uniqid('sku-', true),
308-
ProductInterface::NAME => isset($productData[ProductInterface::NAME])
309-
? $productData[ProductInterface::NAME] : uniqid('sku-', true),
310-
ProductInterface::VISIBILITY => 4,
311-
ProductInterface::TYPE_ID => 'simple',
312-
ProductInterface::PRICE => 3.62,
313-
ProductInterface::STATUS => 1,
314-
ProductInterface::TYPE_ID => 'simple',
315-
ProductInterface::ATTRIBUTE_SET_ID => 4,
312+
Product::SKU => isset($productData[Product::SKU])
313+
? $productData[Product::SKU] : uniqid('sku-', true),
314+
Product::NAME => isset($productData[Product::NAME])
315+
? $productData[Product::NAME] : uniqid('sku-', true),
316+
Product::VISIBILITY => 4,
317+
Product::TYPE_ID => 'simple',
318+
Product::PRICE => 3.62,
319+
Product::STATUS => 1,
320+
Product::TYPE_ID => 'simple',
321+
Product::ATTRIBUTE_SET_ID => 4,
316322
];
317323
}
318324

0 commit comments

Comments
 (0)