AC-15495: [CE] PHPUnit 12: Upgrade Utility & Support Modules related test cases

Author: shashi011

app/code/Magento/Marketplace/Test/Unit/Block/PartnersTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Marketplace\Test\Unit\Block;
 
 use Magento\Marketplace\Block\Partners;
+use Magento\Marketplace\Model\Partners as PartnersModel;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -57,10 +58,10 @@ public function getPartnersBlockMock($methods = null)
     /**
      * Gets partners model mock
      *
-     * @return MockObject|\Magento\Marketplace\Model\Partners
+     * @return MockObject|PartnersModel
      */
     public function getPartnersModelMock($methods)
     {
-        return $this->createPartialMock(\Magento\Marketplace\Model\Partners::class, $methods);
+        return $this->createPartialMock(PartnersModel::class, $methods);
     }
 }

app/code/Magento/Marketplace/Test/Unit/Controller/Index/IndexTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Marketplace\Test\Unit\Controller\Index;
 
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Framework\View\Page\Config;
 use Magento\Framework\View\Page\Title;
 use Magento\Framework\View\Result\Page;
@@ -17,6 +18,8 @@
 
 class IndexTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var MockObject|Index
      */
@@ -32,11 +35,10 @@ protected function setUp(): void
      */
     public function testExecute()
     {
-        $pageMock = $this->getMockBuilder(Page::class)
-            ->addMethods(['setActiveMenu', 'addBreadcrumb'])
-            ->onlyMethods(['getConfig'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $pageMock = $this->createPartialMockWithReflection(
+            Page::class,
+            ['setActiveMenu', 'addBreadcrumb', 'getConfig']
+        );
         $pageMock->expects($this->once())
             ->method('setActiveMenu');
         $pageMock->expects($this->once())

app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php

@@ -101,7 +101,7 @@ public function getLayoutFactoryMock($methods = null)
      */
     public function getLayoutMock()
     {
-        return $this->getMockForAbstractClass(LayoutInterface::class);
+        return $this->createMock(LayoutInterface::class);
     }
 
     /**
@@ -125,6 +125,6 @@ public function getRequestMock($methods = null)
      */
     public function getBlockInterfaceMock()
     {
-        return $this->getMockForAbstractClass(BlockInterface::class);
+        return $this->createMock(BlockInterface::class);
     }
 }

app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php

@@ -33,8 +33,8 @@ class CacheTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->cache = $this->getMockForAbstractClass(CacheInterface::class);
-        $this->serializer = $this->getMockForAbstractClass(SerializerInterface::class);
+        $this->cache = $this->createMock(CacheInterface::class);
+        $this->serializer = $this->createMock(SerializerInterface::class);
         $objectManagerHelper = new ObjectManager($this);
         $this->cacheHelper = $objectManagerHelper->getObject(
             Cache::class,

app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php

@@ -8,6 +8,7 @@
 namespace Magento\Marketplace\Test\Unit\Model;
 
 use Magento\Framework\HTTP\Client\Curl;
+use Magento\Marketplace\Block\Partners as PartnersBlock;
 use Magento\Marketplace\Helper\Cache;
 use Magento\Marketplace\Model\Partners;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -20,6 +21,9 @@ class PartnersTest extends TestCase
      */
     private $partnersModelMock;
 
+    /**
+     * @var string
+     */
     private $returnPackages = '
                  {
                     "partners": {
@@ -126,11 +130,11 @@ public function testGetPartnersException()
     /**
      * Gets partners block mock
      *
-     * @return MockObject|\Magento\Marketplace\Block\Partners
+     * @return MockObject|PartnersBlock
      */
     public function getPartnersBlockMock($methods = null)
     {
-        return $this->createPartialMock(\Magento\Marketplace\Block\Partners::class, $methods);
+        return $this->createPartialMock(PartnersBlock::class, $methods);
     }
 
     /**

app/code/Magento/RequireJs/Test/Unit/Block/Html/Head/ConfigTest.php

@@ -62,7 +62,7 @@ protected function setUp(): void
         $this->config = $this->createMock(\Magento\Framework\RequireJs\Config::class);
         $this->fileManager = $this->createMock(FileManager::class);
         $this->pageConfig = $this->createMock(\Magento\Framework\View\Page\Config::class);
-        $this->bundleConfig = $this->getMockForAbstractClass(ConfigInterface::class);
+        $this->bundleConfig = $this->createMock(ConfigInterface::class);
     }
 
     public function testSetLayout()
@@ -72,16 +72,16 @@ public function testSetLayout()
             ->method('isBundlingJsFiles')
             ->willReturn(true);
         $filePath = 'require_js_fie_path';
-        $asset = $this->getMockForAbstractClass(LocalInterface::class);
+        $asset = $this->createMock(LocalInterface::class);
         $asset->expects($this->atLeastOnce())
             ->method('getFilePath')
             ->willReturn($filePath);
-        $requireJsAsset = $this->getMockForAbstractClass(LocalInterface::class);
+        $requireJsAsset = $this->createMock(LocalInterface::class);
         $requireJsAsset
             ->expects($this->atLeastOnce())
             ->method('getFilePath')
             ->willReturn('/path/to/require/require.js');
-        $minResolverAsset = $this->getMockForAbstractClass(LocalInterface::class);
+        $minResolverAsset = $this->createMock(LocalInterface::class);
         $minResolverAsset
             ->expects($this->atLeastOnce())
             ->method('getFilePath')
@@ -108,11 +108,9 @@ public function testSetLayout()
             ->method('createMinResolverAsset')
             ->willReturn($minResolverAsset);
 
-        $layout = $this->getMockForAbstractClass(LayoutInterface::class);
+        $layout = $this->createMock(LayoutInterface::class);
 
-        $assetCollection = $this->getMockBuilder(GroupedCollection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $assetCollection = $this->createMock(GroupedCollection::class);
         $this->pageConfig->expects($this->atLeastOnce())
             ->method('getAssetCollection')
             ->willReturn($assetCollection);
@@ -122,9 +120,7 @@ public function testSetLayout()
             ->method('insert')
             ->willReturn(true);
 
-        $this->minificationMock = $this->getMockBuilder(Minification::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->minificationMock = $this->createMock(Minification::class);
         $this->minificationMock
             ->expects($this->any())
             ->method('isEnabled')

app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php

@@ -18,6 +18,7 @@
 use Magento\Framework\View\Asset\File\FallbackContext;
 use Magento\Framework\View\Asset\Repository;
 use Magento\RequireJs\Model\FileManager;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -65,14 +66,14 @@ protected function setUp(): void
         $this->appState = $this->createMock(State::class);
         $this->assetRepoMock = $this->createMock(Repository::class);
         $this->object = new FileManager($this->configMock, $this->fileSystem, $this->appState, $this->assetRepoMock);
-        $this->dir = $this->getMockForAbstractClass(WriteInterface::class);
+        $this->dir = $this->createMock(WriteInterface::class);
         $this->asset = $this->createMock(File::class);
     }
 
     /**
      * @param bool $exists
-     * @dataProvider createRequireJsAssetDataProvider
      */
+    #[DataProvider('createRequireJsAssetDataProvider')]
     public function testCreateRequireJsConfigAsset($exists)
     {
         $this->configMock->expects($this->once())
@@ -138,10 +139,7 @@ public function testCreateRequireJsAssetDevMode()
     public function testCreateBundleJsPool()
     {
         unset($this->configMock);
-        $dirRead = $this->getMockBuilder(Read::class)
-            ->setMockClassName('libDir')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $dirRead = $this->createMock(Read::class);
         $context = $this->createMock(FallbackContext::class);
         $assetRepo = $this->createMock(Repository::class);
         $config = $this->createMock(Config::class);
@@ -241,9 +239,7 @@ public function testCreateRequireJsMixinsAsset()
 
     public function testClearBundleJsPool()
     {
-        $context = $this->getMockBuilder(FallbackContext::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $context = $this->createMock(FallbackContext::class);
         $this->fileSystem->expects($this->once())
             ->method('getDirectoryWrite')
             ->with(DirectoryList::STATIC_VIEW)

app/code/Magento/Rule/Test/Unit/Model/AbstractModelTest.php

@@ -17,6 +17,7 @@
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\Rule\Model\AbstractModel;
 use Magento\Rule\Model\Action\Collection;
 use Magento\Rule\Model\Condition\Combine;
@@ -30,6 +31,7 @@
  */
 class AbstractModelTest extends TestCase
 {
+    use MockCreationTrait;
 
     /**
      * @var AbstractModel|MockObject
@@ -63,59 +65,40 @@ class AbstractModelTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->localeDateMock = $this->getMockBuilder(TimezoneInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->formFactoryMock = $this->getMockBuilder(FormFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->registryMock = $this->getMockBuilder(Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->contextMock = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getEventDispatcher'])
-            ->getMock();
-
-        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['dispatch'])
-            ->getMockForAbstractClass();
+        $this->localeDateMock = $this->createMock(TimezoneInterface::class);
+
+        $this->formFactoryMock = $this->createMock(FormFactory::class);
+
+        $this->registryMock = $this->createMock(Registry::class);
+
+        $this->contextMock = $this->createPartialMock(Context::class, ['getEventDispatcher']);
+
+        $this->eventManagerMock = $this->createMock(ManagerInterface::class);
         $this->contextMock->expects($this->any())
             ->method('getEventDispatcher')
             ->willReturn($this->eventManagerMock);
 
-        $resourceMock = $this->getMockBuilder(AbstractResource::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $resourceCollectionMock = $this->getMockBuilder(AbstractDb::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $extensionFactory = $this->getMockBuilder(ExtensionAttributesFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $customAttributeFactory = $this->getMockBuilder(AttributeValueFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->model = $this->getMockForAbstractClass(
-            AbstractModel::class,
-            [
-                'context' => $this->contextMock,
-                'registry' => $this->registryMock,
-                'formFactory' => $this->formFactoryMock,
-                'localeDate' => $this->localeDateMock,
-                'resource' => $resourceMock,
-                'resourceCollection' => $resourceCollectionMock,
-                'data' => [],
-                'extensionFactory' => $extensionFactory,
-                'customAttributeFactory' => $customAttributeFactory,
-                'serializer' => $this->getSerializerMock(),
-            ]
-        );
+        $resourceMock = $this->createMock(AbstractResource::class);
+        $resourceCollectionMock = $this->createMock(AbstractDb::class);
+        $extensionFactory = $this->createMock(ExtensionAttributesFactory::class);
+        $customAttributeFactory = $this->createMock(AttributeValueFactory::class);
+
+        $this->model = $this->createPartialMock(AbstractModel::class, ['getConditionsInstance', 'getActionsInstance']);
+        
+        $constructorArgs = [
+            $this->contextMock,
+            $this->registryMock,
+            $this->formFactoryMock,
+            $this->localeDateMock,
+            $resourceMock,
+            $resourceCollectionMock,
+            [],
+            $extensionFactory,
+            $customAttributeFactory,
+            $this->getSerializerMock(),
+        ];
+        
+        $this->model->__construct(...$constructorArgs);
     }
 
     /**
@@ -125,10 +108,7 @@ protected function setUp(): void
      */
     private function getSerializerMock()
     {
-        $serializerMock = $this->getMockBuilder(Json::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['serialize', 'unserialize'])
-            ->getMock();
+        $serializerMock = $this->createPartialMock(Json::class, ['serialize', 'unserialize']);
 
         $serializerMock->expects($this->any())
             ->method('serialize')
@@ -153,11 +133,7 @@ public function testGetConditions()
     {
         $conditionsArray = ['conditions' => 'serialized'];
         $serializedConditions = json_encode($conditionsArray);
-        $conditions = $this->getMockBuilder(Combine::class)
-            ->addMethods(['setRule', 'setId', 'setPrefix'])
-            ->onlyMethods(['loadArray'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $conditions = $this->createPartialMockWithReflection(Combine::class, ['loadArray', 'setRule', 'setId', 'setPrefix']);
 
         $conditions->expects($this->once())->method('setRule')->willReturnSelf();
         $conditions->expects($this->once())->method('setId')->willReturnSelf();
@@ -176,11 +152,7 @@ public function testGetActions()
     {
         $actionsArray = ['actions' => 'some_actions'];
         $actionsSerialized = json_encode($actionsArray);
-        $actions = $this->getMockBuilder(Collection::class)
-            ->addMethods(['setRule', 'setId', 'setPrefix'])
-            ->onlyMethods(['loadArray'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $actions = $this->createPartialMockWithReflection(Collection::class, ['loadArray', 'setRule', 'setId', 'setPrefix']);
 
         $actions->expects($this->once())->method('setRule')->willReturnSelf();
         $actions->expects($this->once())->method('setId')->willReturnSelf();
@@ -197,15 +169,9 @@ public function testGetActions()
 
     public function testBeforeSave()
     {
-        $conditions = $this->getMockBuilder(Combine::class)
-            ->onlyMethods(['asArray'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $actions = $this->getMockBuilder(Collection::class)
-            ->onlyMethods(['asArray'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $conditions = $this->createPartialMock(Combine::class, ['asArray']);
+
+        $actions = $this->createPartialMock(Collection::class, ['asArray']);
 
         $this->model->setConditions($conditions);
         $this->model->setActions($actions);

app/code/Magento/Rule/Test/Unit/Model/ActionFactoryTest.php

@@ -32,7 +32,7 @@ class ActionFactoryTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+        $this->objectManagerMock = $this->createMock(ObjectManagerInterface::class);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->actionFactory = $this->objectManagerHelper->getObject(