MAGE-1226: updated product tests

Author: damcou

Test/Integration/Indexing/Product/MultiStoreProductsTest.php

@@ -2,7 +2,7 @@
 
 namespace Algolia\AlgoliaSearch\Test\Integration\Indexing\Product;
 
-use Algolia\AlgoliaSearch\Model\Indexer\Product;
+use Algolia\AlgoliaSearch\Service\Product\BatchQueueProcessor as ProductBatchQueueProcessor;
 use Algolia\AlgoliaSearch\Test\Integration\Indexing\MultiStoreTestCase;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -19,8 +19,8 @@
  */
 class MultiStoreProductsTest extends MultiStoreTestCase
 {
-    /** @var Product */
-    protected $productsIndexer;
+    /** @var ProductBatchQueueProcessor */
+    protected $productBatchQueueProcessor;
 
     /** @var ProductRepositoryInterface */
     protected $productRepository;
@@ -53,7 +53,7 @@ protected function setUp():void
     {
         parent::setUp();
 
-        $this->productsIndexer = $this->objectManager->get(Product::class);
+        $this->productBatchQueueProcessor = $this->objectManager->get(ProductBatchQueueProcessor::class);
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->productCollectionFactory = $this->objectManager->get(CollectionFactory::class);
         $this->websiteRepository = $this->objectManager->get(WebsiteRepositoryInterface::class);
@@ -62,8 +62,7 @@ protected function setUp():void
         $this->productPriceIndexer = $this->indexerRegistry->get('catalog_product_price');
         $this->productPriceIndexer->reindexAll();
 
-        $this->productsIndexer->executeFull();
-        $this->algoliaHelper->waitLastTask();
+        $this->reindexToAllStores($this->productBatchQueueProcessor);
     }
 
     public function testMultiStoreProductIndices()
@@ -102,11 +101,7 @@ public function testMultiStoreProductIndices()
         $this->assertEquals(self::VOYAGE_YOGA_BAG_NAME, $voyageYogaBag->getName());
         $this->assertEquals(self::VOYAGE_YOGA_BAG_NAME_ALT, $voyageYogaBagAlt->getName());
 
-        $this->productsIndexer->execute([self::VOYAGE_YOGA_BAG_ID]);
-
-        $this->algoliaHelper->waitLastTask($defaultStore->getId());
-        $this->algoliaHelper->waitLastTask($fixtureSecondStore->getId());
-        $this->algoliaHelper->waitLastTask($fixtureThirdStore->getId());
+        $this->reindexToAllStores($this->productBatchQueueProcessor, [self::VOYAGE_YOGA_BAG_ID]);
 
         $this->assertAlgoliaRecordValues(
             $this->indexPrefix . 'default_products',
@@ -131,11 +126,7 @@ public function testMultiStoreProductIndices()
         $this->productRepository->save($voyageYogaBag);
         $this->productPriceIndexer->reindexRow(self::VOYAGE_YOGA_BAG_ID);
 
-        $this->productsIndexer->execute([self::VOYAGE_YOGA_BAG_ID]);
-
-        $this->algoliaHelper->waitLastTask($defaultStore->getId());
-        $this->algoliaHelper->waitLastTask($fixtureSecondStore->getId());
-        $this->algoliaHelper->waitLastTask($fixtureThirdStore->getId());
+        $this->reindexToAllStores($this->productBatchQueueProcessor, [self::VOYAGE_YOGA_BAG_ID]);
 
         // default store should have the same number of products
         $this->assertNbOfRecordsPerStore(

Test/Integration/Indexing/Product/PricingTest.php

@@ -54,7 +54,7 @@ protected function indexProducts(int|array $productIds): void
         if (!is_array($productIds)) {
             $productIds = [$productIds];
         }
-        $this->productIndexer->execute($productIds);
+        $this->productBatchQueueProcessor->processBatch(1, $productIds);
         $this->algoliaHelper->waitLastTask();
     }
 
@@ -141,7 +141,7 @@ function ($key, $value) {
 
     public function testSpecialPrice(): void
     {
-        $this->productIndexer->execute([self::SPECIAL_PRICE_TEST_PRODUCT_ID]);
+        $this->productBatchQueueProcessor->processBatch(1, [self::SPECIAL_PRICE_TEST_PRODUCT_ID]);
         $this->algoliaHelper->waitLastTask();
 
         $res = $this->algoliaHelper->getObjects(
@@ -175,7 +175,7 @@ public function testSpecialPrice(): void
         ]);
         $product->save();
 
-        $this->productIndexer->execute([self::SPECIAL_PRICE_TEST_PRODUCT_ID]);
+        $this->productBatchQueueProcessor->processBatch(1, [self::SPECIAL_PRICE_TEST_PRODUCT_ID]);
         $this->algoliaHelper->waitLastTask();
 
         $res = $this->algoliaHelper->getObjects(

Test/Integration/Indexing/Product/ProductsIndexingTest.php

@@ -19,8 +19,6 @@ class ProductsIndexingTest extends ProductsIndexingTestCase
     /*** @var IndexerRegistry */
     protected $indexerRegistry;
 
-    protected $productPriceIndexer;
-
     protected $testProductId;
 
     const OUT_OF_STOCK_PRODUCT_SKU = '24-MB01';
@@ -31,7 +29,7 @@ public function testOnlyOnStockProducts()
 
         $this->updateStockItem(self::OUT_OF_STOCK_PRODUCT_SKU, false);
 
-        $this->processTest($this->productIndexer, 'products', $this->assertValues->productsOnStockCount);
+        $this->processTest($this->productBatchQueueProcessor, 'products', $this->assertValues->productsOnStockCount);
     }
 
     public function testIncludingOutOfStock()
@@ -40,7 +38,7 @@ public function testIncludingOutOfStock()
 
         $this->updateStockItem(self::OUT_OF_STOCK_PRODUCT_SKU, false);
 
-        $this->processTest($this->productIndexer, 'products', $this->assertValues->productsOutOfStockCount);
+        $this->processTest($this->productBatchQueueProcessor, 'products', $this->assertValues->productsOutOfStockCount);
     }
 
     public function testDefaultIndexableAttributes()
@@ -52,7 +50,7 @@ public function testDefaultIndexableAttributes()
         $this->setConfig(ConfigHelper::SORTING_INDICES, $empty);
         $this->setConfig(ConfigHelper::PRODUCT_CUSTOM_RANKING, $empty);
 
-        $this->productIndexer->executeRow($this->getValidTestProduct());
+        $this->productBatchQueueProcessor->processBatch(1, [$this->getValidTestProduct()]);
         $this->algoliaHelper->waitLastTask();
 
         $results = $this->algoliaHelper->getObjects($this->indexPrefix . 'default_products', [$this->getValidTestProduct()]);

Test/Integration/Indexing/Product/ProductsIndexingTestCase.php

@@ -2,7 +2,7 @@
 
 namespace Algolia\AlgoliaSearch\Test\Integration\Indexing\Product;
 
-use Algolia\AlgoliaSearch\Model\Indexer\Product as ProductIndexer;
+use Algolia\AlgoliaSearch\Service\Product\BatchQueueProcessor as ProductBatchQueueProcessor;
 use Algolia\AlgoliaSearch\Test\Integration\Indexing\IndexingTestCase;
 use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -12,13 +12,13 @@ class ProductsIndexingTestCase extends IndexingTestCase
 {
 
     protected ?StockRegistry $stockRegistry = null;
-    protected ?ProductIndexer $productIndexer = null;
+    protected ?ProductBatchQueueProcessor $productBatchQueueProcessor = null;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->productIndexer = $this->objectManager->get(ProductIndexer::class);
+        $this->productBatchQueueProcessor = $this->objectManager->get(ProductBatchQueueProcessor::class);
         $this->stockRegistry = $this->objectManager->get(StockRegistry::class);
 
         $this->objectManager