BUG#AC-434[Integration] Magento\Catalog\Block\Product\ListProduct\SortingTest failure on 2.4-develop - issue fixed

Author: glo86052

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php

@@ -392,7 +392,7 @@ private function updateCategorySortBy(
     /**
      * Test product list ordered by price with out-of-stock configurable product options with elasticsearch engine
      *
-     * @magentoDataFixture Magento/Catalog/_files/products_with_not_empty_layered_navigation_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/products_with_not_empty_layered_navigation_attributes.php
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_out-of-stock_child.php
      * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
      * @magentoConfigFixture default/catalog/search/engine elasticsearch7
@@ -407,14 +407,13 @@ public function testProductListOutOfStockSortOrderWithElasticsearch(
         string $direction,
         array $expected
     ): void {
-        $this->markTestSkipped('MC-40449: ListProduct\SortingTest failure on 2.4-develop');
         $this->assertProductListSortOrderWithConfig($sortBy, $direction, $expected);
     }
 
     /**
      * Test product list ordered by price with out-of-stock configurable product options with mysql search engine
      *
-     * @magentoDataFixture Magento/Catalog/_files/products_with_not_empty_layered_navigation_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/products_with_not_empty_layered_navigation_attributes.php
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable_with_out-of-stock_child.php
      * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
      * @magentoConfigFixture default/catalog/search/engine mysql
@@ -429,7 +428,6 @@ public function testProductListOutOfStockSortOrderWithMysql(
         string $direction,
         array $expected
     ): void {
-        $this->markTestSkipped('MC-40449: ListProduct\SortingTest failure on 2.4-develop');
         $this->assertProductListSortOrderWithConfig($sortBy, $direction, $expected);
     }
 

dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_not_empty_layered_navigation_attributes.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Catalog\Model\GetCategoryByName;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Catalog/_files/products_with_layered_navigation_attribute.php'
+);
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(ProductAttributeRepositoryInterface::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+/** @var CategoryRepositoryInterface $categoryRepository */
+$categoryRepository = $objectManager->create(CategoryRepositoryInterface::class);
+/** @var GetCategoryByName $getCategoryByName */
+$getCategoryByName = $objectManager->create(GetCategoryByName::class);
+$category = $getCategoryByName->execute('Category 1');
+$attribute = $attributeRepository->get('test_configurable');
+
+$firstProduct = $productRepository->get('simple1');
+$firstProduct->setData('test_configurable', $attribute->getSource()->getOptionId('Option 1'));
+$firstProduct->setStockData(
+    [
+        'qty' => 0,
+    ]
+);
+$productRepository->save($firstProduct);
+
+$secondProduct = $productRepository->get('simple2');
+$secondProduct->setData('test_configurable', $attribute->getSource()->getOptionId('Option 2'));
+$secondProduct->setStockData(
+    [
+        'qty' => 0,
+    ]
+);
+$productRepository->save($secondProduct);
+
+$thirdProduct = $productRepository->get('simple3');
+$thirdProduct->setData('test_configurable', $attribute->getSource()->getOptionId('Option 2'));
+$thirdProduct->setStockData(
+    [
+        'qty' => 0,
+    ]
+);
+$thirdProduct->setStatus(Status::STATUS_ENABLED);
+$productRepository->save($thirdProduct);
+
+$oldStoreId = $storeManager->getStore()->getId();
+$storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+$category->addData(['available_sort_by' => 'position,name,price,test_configurable']);
+try {
+    $categoryRepository->save($category);
+} finally {
+    $storeManager->setCurrentStore($oldStoreId);
+}