ACP2E-3166: [Cloud] Graphql Product sorting do not work

Author: glo23503

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

@@ -115,14 +115,25 @@ protected function setUp(): void
     }
 
     /**
-     * Verify that products returned in a correct order
+     * Verify that products returned in a correct order 
      *
-     * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @dataProvider sortByPriceAndNameDataProvider
      */
-    public function testSortMultipleFieldsSentInVariables(): void
+    #[
+        DataFixture(ProductFixture::class, ['price' => 10, 'name' => 'search product 1'], 'prod1'),
+        DataFixture(ProductFixture::class, ['price' => 10, 'name' => 'search product 2'], 'prod2'),
+        DataFixture(ProductFixture::class, ['price' => 20, 'name' => 'search product 3'], 'prod3'),
+        DataFixture(ProductFixture::class, ['price' => 30, 'name' => 'search product 4'], 'prod4'),
+        DataFixture(ProductFixture::class, ['price' => 40, 'name' => 'search product 5'], 'prod5'),
+    ]
+    public function testSortMultipleFieldsSentInVariables($sort, $expectedOrder): void
     {
-        $queryAsc = <<<'QUERY'
+        $expectedOrderSku = [];
+        foreach ($expectedOrder as $productName) {
+            $expectedOrderSku[] = $this->fixture->get($productName)->getSku();
+        }
+        $query = <<<'QUERY'
 query GetProductsQuery(
     $search: String,
     $filter: ProductAttributeFilterInput,
@@ -162,85 +173,37 @@ public function testSortMultipleFieldsSentInVariables(): void
             'filter' => [],
             'pageSize' => 24,
             'currentPage' => 1,
-            'sort' => ['price' => 'ASC', 'name' => 'ASC']
+            'sort' => $sort
         ];
-        $response = $this->graphQlQuery($queryAsc, $variables);
-        $this->assertEquals(5, $response['products']['total_count']);
-        $prod1 = $this->productRepository->get('search_product_1');
-        $prod2 = $this->productRepository->get('search_product_2');
-        $prod3 = $this->productRepository->get('search_product_3');
-        $prod4 = $this->productRepository->get('search_product_4');
-        $prod5 = $this->productRepository->get('search_product_5');
-
-        $filteredProducts = [$prod1, $prod2, $prod3, $prod4, $prod5];
-        $productItemsInResponse = array_map(null, $response['products']['items'], $filteredProducts);
-        foreach ($productItemsInResponse as $itemIndex => $itemArray) {
-            $this->assertNotEmpty($itemArray);
-            $this->assertResponseFields(
-                $productItemsInResponse[$itemIndex][0],
-                [
-                    'name' => $filteredProducts[$itemIndex]->getName(),
-                ]
-            );
-        }
 
-        //price DESC and name ASC order
-        $queryPriceDescNameAsc = <<<'QUERY'
-query GetProductsQuery(
-    $search: String,
-    $filter: ProductAttributeFilterInput,
-    $pageSize: Int,
-    $currentPage: Int,
-    $sort: ProductAttributeSortInput
-) {
-    products(
-        search: $search,
-        filter: $filter,
-        pageSize: $pageSize,
-        currentPage: $currentPage,
-        sort: $sort
-    ) {
-        total_count
-        page_info{total_pages}
-        items{
-            __typename
-            url_key
-            sku
-            name
-            stock_status
-            price_range {
-                minimum_price {
-                    final_price {
-                        value
-                        currency
-                    }
-                }
-            }
-        }
+        $response = $this->graphQlQuery($query, $variables);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertEquals($expectedOrderSku, array_column($response['products']['items'], 'sku'));
     }
-}
-QUERY;
-        $variables = [
-            'search' => null,
-            'filter' => [],
-            'pageSize' => 24,
-            'currentPage' => 1,
-            'sort' => ['price' => 'DESC', 'name' => 'ASC']
-        ];
-        $response = $this->graphQlQuery($queryPriceDescNameAsc, $variables);
-        $this->assertEquals(5, $response['products']['total_count']);
 
-        $filteredProducts = [$prod5, $prod4, $prod3, $prod1, $prod2];
-        $productItemsInResponse = array_map(null, $response['products']['items'], $filteredProducts);
-        foreach ($productItemsInResponse as $itemIndex => $itemArray) {
-            $this->assertNotEmpty($itemArray);
-            $this->assertResponseFields(
-                $productItemsInResponse[$itemIndex][0],
-                [
-                    'name' => $filteredProducts[$itemIndex]->getName(),
-                ]
-            );
-        }
+    /**
+     * @return array
+     */
+    public function sortByPriceAndNameDataProvider(): array
+    {
+        return [
+            [
+                ['price' => 'ASC', 'name' => 'ASC'],
+                ['prod1', 'prod2', 'prod3', 'prod4', 'prod5']
+            ],
+            [
+                ['price' => 'DESC', 'name' => 'ASC'],
+                ['prod5', 'prod4', 'prod3', 'prod1', 'prod2']
+            ],
+            [
+                ['price' => 'ASC', 'name' => 'DESC'],
+                ['prod2', 'prod1', 'prod3', 'prod4', 'prod5']
+            ],
+            [
+                ['price' => 'DESC', 'name' => 'DESC'],
+                ['prod5', 'prod4', 'prod3', 'prod2', 'prod1']
+            ],
+        ];
     }
 
     /**