Fixing unit test errors

Author: aligent-lturner

app/code/Magento/CatalogRule/Model/Indexer/ReindexRuleProductsPriceProcessor.php

@@ -59,7 +59,7 @@ public function execute(
             : $this->getDateInterval(Store::DEFAULT_STORE_ID);
 
         while ($ruleData = $productsStmt->fetch()) {
-            $ruleProductId = $ruleData['product_id'];
+            $ruleProductId = (int)$ruleData['product_id'];
             $productKey = $ruleProductId .
                 '_' .
                 $ruleData['website_id'] .
@@ -99,7 +99,7 @@ public function execute(
      * @param array $ruleData
      * @param DateTime $date
      * @param string $productKey
-     * @param string $ruleProductId
+     * @param int $ruleProductId
      * @param array $dayPrices
      * @param array $stopFlags
      * @return void
@@ -108,7 +108,7 @@ private function processDate(
         array $ruleData,
         DateTime $date,
         string $productKey,
-        string $ruleProductId,
+        int $ruleProductId,
         array &$dayPrices,
         array &$stopFlags
     ): void {

app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductPriceTest.php

@@ -9,10 +9,10 @@
 
 use Magento\CatalogRule\Model\Indexer\ProductPriceCalculator;
 use Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice;
+use Magento\CatalogRule\Model\Indexer\ReindexRuleProductsPriceProcessor;
 use Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor;
 use Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Store\Api\Data\GroupInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -50,6 +50,11 @@ class ReindexRuleProductPriceTest extends TestCase
      */
     private $pricesPersistorMock;
 
+    /**
+     * @var ReindexRuleProductsPriceProcessor|MockObject
+     */
+    private $reindexRuleProductsPriceProcessorMock;
+
     /**
      * @inheritDoc
      */
@@ -60,14 +65,16 @@ protected function setUp(): void
         $this->productPriceCalculatorMock = $this->createMock(ProductPriceCalculator::class);
         $this->localeDate = $this->getMockForAbstractClass(TimezoneInterface::class);
         $this->pricesPersistorMock = $this->createMock(RuleProductPricesPersistor::class);
+        $this->reindexRuleProductsPriceProcessorMock = $this->createMock(ReindexRuleProductsPriceProcessor::class);
 
         $this->model = new ReindexRuleProductPrice(
             $this->storeManagerMock,
             $this->ruleProductsSelectBuilderMock,
             $this->productPriceCalculatorMock,
             $this->localeDate,
             $this->pricesPersistorMock,
-            true
+            true,
+            $this->reindexRuleProductsPriceProcessorMock
         );
     }
 
@@ -77,30 +84,15 @@ protected function setUp(): void
     public function testExecute(): void
     {
         $websiteId = 234;
-        $defaultGroupId = 11;
-        $defaultStoreId = 22;
         $productId = 55;
 
         $websiteMock = $this->getMockForAbstractClass(WebsiteInterface::class);
         $websiteMock->expects($this->once())
             ->method('getId')
             ->willReturn($websiteId);
-        $websiteMock->expects($this->once())
-            ->method('getDefaultGroupId')
-            ->willReturn($defaultGroupId);
         $this->storeManagerMock->expects($this->once())
             ->method('getWebsites')
             ->willReturn([$websiteMock]);
-        $groupMock = $this->getMockForAbstractClass(GroupInterface::class);
-        $groupMock->method('getId')
-            ->willReturn($defaultStoreId);
-        $groupMock->expects($this->once())
-            ->method('getDefaultStoreId')
-            ->willReturn($defaultStoreId);
-        $this->storeManagerMock->expects($this->once())
-            ->method('getGroup')
-            ->with($defaultGroupId)
-            ->willReturn($groupMock);
 
         $statementMock = $this->createMock(\Zend_Db_Statement_Interface::class);
         $this->ruleProductsSelectBuilderMock->expects($this->once())
@@ -117,18 +109,11 @@ public function testExecute(): void
             'action_stop' => true
         ];
 
-        $this->localeDate->expects($this->once())
-            ->method('scopeDate')
-            ->with($defaultStoreId, null, true)
-            ->willReturn(new \DateTime());
-
         $statementMock
             ->method('fetch')
             ->willReturnOnConsecutiveCalls($ruleData, false);
 
-        $this->productPriceCalculatorMock->expects($this->atLeastOnce())
-            ->method('calculate');
-        $this->pricesPersistorMock->expects($this->once())
+        $this->reindexRuleProductsPriceProcessorMock->expects($this->once())
             ->method('execute');
 
         $this->assertTrue($this->model->execute(1, $productId, true));

app/code/Magento/CatalogRule/Test/Unit/Model/Indexer/ReindexRuleProductsPriceProcessorTest.php

@@ -9,7 +9,6 @@
 use Magento\CatalogRule\Model\Indexer\ProductPriceCalculator;
 use Magento\CatalogRule\Model\Indexer\ReindexRuleProductsPriceProcessor;
 use Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Api\Data\GroupInterface;
 use Magento\Store\Api\Data\WebsiteInterface;
@@ -67,23 +66,14 @@ protected function setUp(): void
      */
     public function testExecute(): void
     {
-        $websiteId = 234;
         $defaultGroupId = 11;
         $defaultStoreId = 22;
 
         $websiteMock = $this->getMockForAbstractClass(WebsiteInterface::class);
-        $websiteMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($websiteId);
         $websiteMock->expects($this->once())
             ->method('getDefaultGroupId')
             ->willReturn($defaultGroupId);
-        $this->storeManagerMock->expects($this->once())
-            ->method('getWebsites')
-            ->willReturn([$websiteMock]);
         $groupMock = $this->getMockForAbstractClass(GroupInterface::class);
-        $groupMock->method('getId')
-            ->willReturn($defaultStoreId);
         $groupMock->expects($this->once())
             ->method('getDefaultStoreId')
             ->willReturn($defaultStoreId);