AC-15635: PHPUnit 12 Upgrade | Optimize code

manishranjan-adobe · manishranjan-adobe · commit db6f887e5133 · 2025-11-11T15:56:17.000+05:30
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php
@@ -94,7 +94,8 @@ public function testInitInternalCalls()
         $groups = [$groupTest];
         $groupSearchResult->method('getItems')->willReturn($groups);
 
-        $this->tierPrice->init(null);
+        $productMock = $this->createMock(Product::class);
+        $this->tierPrice->init($productMock);
     }
 
     public function testInitAddToCustomerGroups()
@@ -119,7 +120,8 @@ public function testInitAddToCustomerGroups()
         $groups = [$groupTest];
         $groupSearchResult->method('getItems')->willReturn($groups);
 
-        $this->tierPrice->init(null);
+        $productMock = $this->createMock(Product::class);
+        $this->tierPrice->init($productMock);
 
         $reflection = new ReflectionClass($this->tierPrice);
         $property = $reflection->getProperty('customerGroups');
@@ -146,19 +148,7 @@ public function testIsValidResultTrue()
     #[DataProvider('isValidAddMessagesCallDataProvider')]
     public function testIsValidAddMessagesCall($value, $hasEmptyColumns, $customerGroups, $expectedMessages)
     {
-        $priceContextMock = $this->getMockBuilder(Product::class)
-            ->setConstructorArgs(
-                [
-                    Data::class,
-                    ImportExportHelperData::class,
-                    ResourceImportData::class,
-                    Config::class,
-                    ResourceConnection::class,
-                    Helper::class,
-                    StringUtils::class,
-                    'ProcessingErrorAggregatorInterface'
-                ]
-            );
+        $priceContextMock = $this->createMock(Product::class);
 
         $this->tierPrice->expects($this->once())->method('isValidValueAndLength')->willReturn(true);
         $this->tierPrice->method('hasEmptyColumns')->willReturn($hasEmptyColumns);
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
@@ -11,6 +11,7 @@
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\FullFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext as FulltextResource;
 use Magento\Elasticsearch\Model\Indexer\IndexerHandler;
 use Magento\Framework\Amqp\ConfigPool as AmqpConfigPool;
 use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
@@ -48,7 +49,7 @@ class FulltextTest extends TestCase
     protected $saveHandler;
 
     /**
-     * @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext|MockObject
+     * @var FulltextResource|MockObject
      */
     protected $fulltextResource;
 
@@ -77,7 +78,7 @@ protected function setUp(): void
         );
         $indexerHandlerFactory->method('create')->willReturn($this->saveHandler);
 
-        $this->fulltextResource = $this->getClassMock(\Magento\CatalogSearch\Model\ResourceModel\Fulltext::class);
+        $this->fulltextResource = $this->getClassMock(FulltextResource::class);
 
         $this->dimensionProviderMock = $this->getMockBuilder(DimensionProviderInterface::class)
             ->getMock();
@@ -101,8 +102,14 @@ protected function setUp(): void
         ];
         $objectManagerHelper->prepareObjectManager($objects);
 
-        $this->processManager = new ProcessManager(
-            $this->getClassMock(ResourceConnection::class)
+        $this->processManager = $this->createMock(ProcessManager::class);
+        $this->processManager->method('execute')->willReturnCallback(
+            function ($userFunctions) {
+                // Execute each function in the array
+                foreach ($userFunctions as $callback) {
+                    $callback();
+                }
+            }
         );
 
         $this->model = $objectManagerHelper->getObject(
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/CategoryTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/CategoryTest.php
@@ -13,6 +13,7 @@
 use Magento\Catalog\Model\Layer\Filter\Item;
 use Magento\Catalog\Model\Layer\Filter\Item\DataBuilder;
 use Magento\Catalog\Model\Layer\Filter\ItemFactory;
+use Magento\CatalogSearch\Model\Layer\Filter\Category as CategoryFilter;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Escaper;
@@ -138,7 +139,7 @@ protected function setUp(): void
 
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->target = $objectManagerHelper->getObject(
-            \Magento\CatalogSearch\Model\Layer\Filter\Category::class,
+            CategoryFilter::class,
             [
                 'categoryDataProviderFactory' => $dataProviderFactory,
                 'layer' => $this->layer,
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/DecimalTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/DecimalTest.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Layer\Filter\Item;
 use Magento\Catalog\Model\Layer\Filter\ItemFactory;
 use Magento\Catalog\Model\Layer\State;
+use Magento\Catalog\Model\ResourceModel\Layer\Filter\Decimal as DecimalResource;
 use Magento\Catalog\Model\ResourceModel\Layer\Filter\DecimalFactory;
 use Magento\CatalogSearch\Model\Layer\Filter\Decimal;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
@@ -113,7 +114,7 @@ function (array $data) {
             DecimalFactory::class,
             ['create']
         );
-        $resource = $this->createMock(\Magento\Catalog\Model\ResourceModel\Layer\Filter\Decimal::class);
+        $resource = $this->createMock(DecimalResource::class);
         $filterDecimalFactory->expects($this->once())
             ->method('create')
             ->willReturn($resource);
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php
@@ -18,7 +18,10 @@
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Escaper;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
+use Magento\Framework\UrlInterface;
+use Magento\Theme\Block\Html\Pager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -129,13 +132,13 @@ protected function setUp(): void
             ->willReturnCallback(
                 function (array $data) {
                     return new Item(
-                        $this->createMock(\Magento\Framework\UrlInterface::class),
-                        $this->createMock(\Magento\Theme\Block\Html\Pager::class),
+                        $this->createMock(UrlInterface::class),
+                        $this->createMock(Pager::class),
                         $data
                     );
                 }
             );
-        $priceFormatter = $this->createMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
+        $priceFormatter = $this->createMock(PriceCurrencyInterface::class);
         $priceFormatter->method('format')
             ->willReturnCallback(
                 function ($number) {
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Request/PartialSearchModifierTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/Request/PartialSearchModifierTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search\Request;
 
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
 use Magento\CatalogSearch\Model\Search\Request\PartialSearchModifier;
@@ -61,7 +62,7 @@ public function testModify(array $attributes, array $requests, array $expected):
         $searchWeight = 10;
         foreach ($attributes as $attribute) {
             $item = $this->createPartialMockWithReflection(
-                \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class,
+                Attribute::class,
                 ['getSearchWeight', 'getAttributeCode']
             );
             $item->method('getAttributeCode')
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryHashMapTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryHashMapTest.php
@@ -8,6 +8,7 @@
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Map;
 
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\ResourceModel\Category;
 use Magento\Catalog\Model\ResourceModel\CategoryFactory;
@@ -62,7 +63,7 @@ public function testGetAllData()
         $categoryIdsOther = ['2' => [2, 3, 4]];
 
         $categoryMock = $this->createPartialMockWithReflection(
-            \Magento\Catalog\Model\Category::class,
+            CategoryModel::class,
             ['getResource']
         );
         $connectionAdapterMock = $this->createMock(AdapterInterface::class);
@@ -96,11 +97,11 @@ public function testGetAllData()
             });
 
         $this->assertEquals($categoryIds, $this->model->getAllData(1));
-        $this->assertEquals($categoryIds[2], $this->model->getData(1, 2));
+        $this->assertEquals($categoryIds['2'], $this->model->getData(1, '2'));
         $this->assertEquals($categoryIdsOther, $this->model->getAllData(2));
-        $this->assertEquals($categoryIdsOther[2], $this->model->getData(2, 2));
+        $this->assertEquals($categoryIdsOther['2'], $this->model->getData(2, '2'));
         $this->model->resetData(1);
-        $this->assertEquals($categoryIds[2], $this->model->getData(1, 2));
+        $this->assertEquals($categoryIds['2'], $this->model->getData(1, '2'));
         $this->assertEquals($categoryIds, $this->model->getAllData(1));
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUsedInProductsHashMapTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Map/DataCategoryUsedInProductsHashMapTest.php
@@ -90,18 +90,11 @@ public function testGetAllData(): void
 
         $this->connectionMock->method('getConnection')->willReturn($connectionMock);
         $connectionMock->method('select')->willReturn($selectMock);
-        $connectionMock->expects($this->any())
-            ->method('fetchCol')
+        $connectionMock->method('fetchCol')
             ->willReturnOnConsecutiveCalls($categoryIds, $categoryIdsOther, $categoryIds);
-        $selectMock->expects($this->any())
-            ->method('from')
-            ->willReturnSelf();
-        $selectMock->expects($this->any())
-            ->method('joinInner')
-            ->willReturnSelf();
-        $selectMock->expects($this->any())
-            ->method('where')
-            ->willReturnSelf();
+        $selectMock->method('from')->willReturnSelf();
+        $selectMock->method('joinInner')->willReturnSelf();
+        $selectMock->method('where')->willReturnSelf();
         $this->hashMapPoolMock
             ->method('resetMap')
             ->willReturnCallback(function ($arg1, $arg2) {
@@ -111,11 +104,11 @@ public function testGetAllData(): void
             });
 
         $this->assertEquals($categoryIds, $this->model->getAllData(1));
-        $this->assertEquals($categoryIds[2], $this->model->getData(1, 2));
+        $this->assertEquals($categoryIds['2'], $this->model->getData(1, '2'));
         $this->assertEquals($categoryIdsOther, $this->model->getAllData(2));
-        $this->assertEquals($categoryIdsOther[2], $this->model->getData(2, 2));
+        $this->assertEquals($categoryIdsOther['2'], $this->model->getData(2, '2'));
         $this->model->resetData(1);
-        $this->assertEquals($categoryIds[2], $this->model->getData(1, 2));
+        $this->assertEquals($categoryIds['2'], $this->model->getData(1, '2'));
         $this->assertEquals($categoryIds, $this->model->getAllData(1));
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/AfterImportDataObserverTest.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Eav\Model\ResourceModel\AttributeValue;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -194,7 +195,7 @@ protected function setUp(): void
     {
         $this->skuStorageMock = $this->createMock(ImportProduct\SkuStorage::class);
         $this->importProduct = $this->createPartialMock(
-            \Magento\CatalogImportExport\Model\Import\Product::class,
+            ImportProduct::class,
             [
                 'getNewSku',
                 'getProductCategories',
@@ -237,7 +238,7 @@ protected function setUp(): void
         );
         $this->urlFinder = $this->createMock(UrlFinderInterface::class);
         $this->urlRewrite = $this->createMock(UrlRewrite::class);
-        $this->product = $this->createMock(\Magento\Catalog\Model\Product::class);
+        $this->product = $this->createMock(Product::class);
         $this->objectRegistry = $this->createMock(ObjectRegistry::class);
         $mergeDataProviderFactory = $this->createPartialMock(
             MergeDataProviderFactory::class,
@@ -290,12 +291,10 @@ public function testAfterImportData()
             ]
         );
         $storeIds = [1, Store::DEFAULT_STORE_ID];
-        $websiteMock
-            ->expects($this->once())
+        $websiteMock->expects($this->once())
             ->method('getStoreIds')
             ->willReturn($storeIds);
-        $this->storeManager
-            ->expects($this->once())
+        $this->storeManager->expects($this->once())
             ->method('getWebsite')
             ->with($websiteId)
             ->willReturn($websiteMock);
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php
@@ -12,8 +12,9 @@
 use Magento\Catalog\Model\Category\DataProvider as CategoryDataProvider;
 use Magento\CatalogUrlRewrite\Plugin\Catalog\Block\Adminhtml\Category\Tab\Attributes;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use PHPUnit\Framework\MockObject\MockObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -68,7 +69,7 @@ protected function setUp(): void
      * @param string $expectedValueMap
      * @return void
      */
-    #[\PHPUnit\Framework\Attributes\DataProvider('attributesMetaDataProvider')]
+    #[DataProvider('attributesMetaDataProvider')]
     public function testGetAttributesMeta(bool $configEnabled, string $expectedValue, string $expectedValueMap): void
     {
         $this->categoryMock->expects($this->once())
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Block/Adminhtml/Product/Edit/NewVideoTest.php b/app/code/Magento/ProductVideo/Test/Unit/Block/Adminhtml/Product/Edit/NewVideoTest.php
@@ -78,9 +78,7 @@ class NewVideoTest extends TestCase
     protected $directoryHelperMock;
 
     /**
-     * |\Magento\ProductVideo\Block\Adminhtml\Product\Edit\NewVideo
-     *
-     * @var ObjectManager
+     * @var NewVideo|MockObject
      */
     protected $block;
 
@@ -108,7 +106,7 @@ protected function setUp(): void
     public function testGetHtmlId()
     {
         $expectedId = 'id_test123';
-        $this->block->expects($this->once())->method('getHtmlId')->willReturn($expectedId);
+        $this->block->method('getHtmlId')->willReturn($expectedId);
         $result = $this->block->getHtmlId();
         $this->assertEquals($expectedId, $result);
     }
@@ -117,7 +115,7 @@ public function testGetWidgetOptions()
     {
         $expectedOptions = '{"saveVideoUrl":"test_url","saveRemoteVideoUrl":"test_remote_url","htmlId":"test_id",'
             . '"youTubeApiKey":null,"videoSelector":"#media_gallery_content"}';
-        $this->block->expects($this->once())->method('getWidgetOptions')->willReturn($expectedOptions);
+        $this->block->method('getWidgetOptions')->willReturn($expectedOptions);
         $result = $this->block->getWidgetOptions();
         $this->assertEquals($expectedOptions, $result);
     }
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Block/Product/View/GalleryTest.php b/app/code/Magento/ProductVideo/Test/Unit/Block/Product/View/GalleryTest.php
