Merge remote-tracking branch 'origin/MC-38546' into 2.4-develop-pr122

Author: zakdma

app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php

@@ -21,6 +21,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\RuntimeException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -110,7 +111,7 @@ protected function setUp(): void
         $this->groupManagementMock->expects($this->any())->method('getAllCustomersGroup')
             ->willReturn($group);
         $this->tierPriceExtensionFactoryMock = $this->getMockBuilder(ProductTierPriceExtensionFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->model = $this->objectManagerHelper->getObject(
@@ -182,9 +183,7 @@ function () {
             );
 
         // create sample TierPrice objects that would be coming from a REST call
-        $tierPriceExtensionMock = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
-            ->setMethods(['getWebsiteId', 'setWebsiteId', 'getPercentageValue', 'setPercentageValue'])
-            ->getMockForAbstractClass();
+        $tierPriceExtensionMock = $this->getProductTierPriceExtensionInterfaceMock();
         $tierPriceExtensionMock->expects($this->any())->method('getWebsiteId')->willReturn($expectedWebsiteId);
         $tierPriceExtensionMock->expects($this->any())->method('getPercentageValue')->willReturn(null);
         $tp1 = $this->objectManagerHelper->getObject(TierPrice::class);
@@ -226,9 +225,7 @@ function () {
             $this->assertEquals($tps[$i]->getQty(), $tpData['price_qty'], 'Qty does not match');
         }
 
-        $tierPriceExtensionMock = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
-            ->setMethods(['getWebsiteId', 'setWebsiteId', 'getPercentageValue', 'setPercentageValue'])
-            ->getMockForAbstractClass();
+        $tierPriceExtensionMock = $this->getProductTierPriceExtensionInterfaceMock();
         $tierPriceExtensionMock->expects($this->any())->method('getPercentageValue')->willReturn(50);
         $tierPriceExtensionMock->expects($this->any())->method('setWebsiteId');
         $this->tierPriceExtensionFactoryMock->expects($this->any())
@@ -289,14 +286,30 @@ function () {
                     return $this->objectManagerHelper->getObject(TierPrice::class);
                 }
             );
-        $tierPriceExtensionMock = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
-            ->onlyMethods(['getPercentageValue', 'setPercentageValue'])
-            ->getMockForAbstractClass();
+        $tierPriceExtensionMock = $this->getProductTierPriceExtensionInterfaceMock();
         $tierPriceExtensionMock->method('getPercentageValue')
             ->willReturn(50);
         $this->tierPriceExtensionFactoryMock->method('create')
             ->willReturn($tierPriceExtensionMock);
 
         $this->assertInstanceOf(TierPrice::class, $this->model->getTierPrices($this->product)[0]);
     }
+
+    /**
+     * Build ProductTierPriceExtensionInterface mock.
+     *
+     * @return MockObject
+     */
+    private function getProductTierPriceExtensionInterfaceMock(): MockObject
+    {
+        $mockBuilder = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
+            ->disableOriginalConstructor();
+        try {
+            $mockBuilder->addMethods(['getPercentageValue', 'setPercentageValue', 'setWebsiteId', 'getWebsiteId']);
+        } catch (RuntimeException $e) {
+            // ProductTierPriceExtensionInterface already generated and has all necessary methods.
+        }
+
+        return $mockBuilder->getMock();
+    }
 }

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/MemoryTest.php

@@ -9,6 +9,8 @@
  */
 namespace Magento\Test\Bootstrap;
 
+use Magento\TestFramework\MemoryLimit;
+
 class MemoryTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -17,7 +19,7 @@ class MemoryTest extends \PHPUnit\Framework\TestCase
     protected $_object;
 
     /**
-     * @var \Magento\TestFramework\MemoryLimit|\PHPUnit\Framework\MockObject\MockObject
+     * @var MemoryLimit|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $_memoryLimit;
 
@@ -28,8 +30,10 @@ class MemoryTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp(): void
     {
-        $this->_memoryLimit = $this->createPartialMock(\Magento\TestFramework\MemoryLimit::class, ['printStats']);
-        $this->_activationPolicy = $this->createPartialMock(\stdClass::class, ['register_shutdown_function']);
+        $this->_memoryLimit = $this->createPartialMock(MemoryLimit::class, ['printStats']);
+        $this->_activationPolicy = $this->getMockBuilder(\stdClass::class)
+            ->addMethods(['register_shutdown_function'])
+            ->getMock();
         $this->_object = new \Magento\TestFramework\Bootstrap\Memory(
             $this->_memoryLimit,
             [$this->_activationPolicy, 'register_shutdown_function']

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/EventManagerTest.php

@@ -28,8 +28,12 @@ class EventManagerTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp(): void
     {
-        $this->_subscriberOne = $this->createPartialMock(\stdClass::class, ['testEvent']);
-        $this->_subscriberTwo = $this->createPartialMock(\stdClass::class, ['testEvent']);
+        $this->_subscriberOne = $this->getMockBuilder(\stdClass::class)
+            ->addMethods(['testEvent'])
+            ->getMock();
+        $this->_subscriberTwo = $this->getMockBuilder(\stdClass::class)
+            ->addMethods(['testEvent'])
+            ->getMock();
         $this->_eventManager = new \Magento\TestFramework\EventManager(
             [$this->_subscriberOne, $this->_subscriberTwo]
         );

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Helper/BootstrapTest.php

@@ -47,10 +47,11 @@ protected function setUp(): void
             \Magento\TestFramework\Application::class,
             ['getTempDir', 'getInitParams', 'reinitialize', 'run']
         );
-        $this->_bootstrap = $this->createPartialMock(
-            \Magento\TestFramework\Bootstrap::class,
-            ['getApplication', 'getDbVendorName']
-        );
+        $this->_bootstrap = $this->getMockBuilder(\Magento\TestFramework\Bootstrap::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getDbVendorName'])
+            ->onlyMethods(['getApplication'])
+            ->getMock();
         $this->_bootstrap->expects(
             $this->any()
         )->method(

lib/internal/Magento/Framework/Mview/Test/Unit/ViewTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -7,12 +8,13 @@
 
 namespace Magento\Framework\Mview\Test\Unit;
 
-use Laminas\Log\Filter\Mock;
 use Magento\Framework\Mview\ActionFactory;
 use Magento\Framework\Mview\ActionInterface;
 use Magento\Framework\Mview\ConfigInterface;
 use Magento\Framework\Mview\View;
 use Magento\Framework\Mview\View\Changelog;
+use Magento\Framework\Mview\View\ChangeLogBatchWalkerFactory;
+use Magento\Framework\Mview\View\ChangeLogBatchWalkerInterface;
 use Magento\Framework\Mview\View\StateInterface;
 use Magento\Framework\Mview\View\Subscription;
 use Magento\Framework\Mview\View\SubscriptionFactory;
@@ -55,7 +57,7 @@ class ViewTest extends TestCase
     protected $subscriptionFactoryMock;
 
     /**
-     * @var MockObject|View\ChangeLogBatchIteratorInterface
+     * @var MockObject|ChangeLogBatchWalkerInterface
      */
     private $iteratorMock;
 
@@ -73,7 +75,15 @@ protected function setUp(): void
             true,
             ['getView']
         );
-        $this->iteratorMock = $this->createMock(View\ChangeLogBatchIteratorInterface::class);
+        $this->iteratorMock = $this->getMockBuilder(ChangeLogBatchWalkerInterface::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['walk'])
+            ->getMockForAbstractClass();
+        $changeLogBatchWalkerFactory = $this->getMockBuilder(ChangeLogBatchWalkerFactory::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['create'])
+            ->getMockForAbstractClass();
+        $changeLogBatchWalkerFactory->method('create')->willReturn($this->iteratorMock);
         $this->actionFactoryMock = $this->createPartialMock(ActionFactory::class, ['get']);
         $this->stateMock = $this->createPartialMock(
             State::class,
@@ -107,7 +117,7 @@ protected function setUp(): void
             $this->subscriptionFactoryMock,
             [],
             [],
-            $this->iteratorMock
+            $changeLogBatchWalkerFactory
         );
     }
 
@@ -485,7 +495,7 @@ public function testUpdateWithException()
         );
         $this->iteratorMock->expects($this->any())
             ->method('walk')
-            ->willReturn([2,3]);
+            ->willReturn([2, 3]);
 
         $actionMock = $this->createPartialMock(ActionInterface::class, ['execute']);
         $actionMock->expects($this->once())->method('execute')->with($listId)->willReturnCallback(
@@ -796,6 +806,7 @@ protected function getViewData()
             'action_class' => 'Some\Class\Name',
             'group' => 'some_group',
             'subscriptions' => ['some_entity' => ['name' => 'some_entity', 'column' => 'entity_id']],
+            'walker' => ChangeLogBatchWalkerInterface::class
         ];
     }
 }