AC-15635: PHPUnit 12 Upgrade | Fix Unit Test Failure

manishranjan-adobe · manishranjan-adobe · commit da140491e079 · 2025-10-28T20:11:35.000+05:30
diff --git a/app/code/Magento/Catalog/Test/Unit/Helper/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Helper/ProductTest.php
@@ -8,7 +8,9 @@
 namespace Magento\Catalog\Test\Unit\Helper;
 
 use Magento\Catalog\Helper\Product;
+use Magento\Catalog\Model\Product as ProductModel;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class ProductTest extends TestCase
@@ -34,8 +36,8 @@ protected function setUp(): void
     /**
      * @param mixed $data
      * @param boolean $result
-     * @dataProvider getData
      */
+    #[DataProvider('getData')]
     public function testIsDataForPriceIndexerWasChanged($data, $result)
     {
         if (is_callable($data)) {
@@ -46,20 +48,14 @@ public function testIsDataForPriceIndexerWasChanged($data, $result)
 
     protected function getMockForCatalogProduct($method)
     {
-        $product = $this->getMockBuilder(
-            Product::class
-        )->disableOriginalConstructor()
-            ->getMock();
-        if ($method!=null) {
-            $product->expects(
-                $this->once()
-            )->method(
-                $method
-            )->with(
-                'attribute'
-            )->willReturn(
-                true
-            );
+        if ($method != null) {
+            $product = $this->createPartialMock(ProductModel::class, [$method]);
+            $product->expects($this->once())
+                ->method($method)
+                ->with('attribute')
+                ->willReturn(true);
+        } else {
+            $product = $this->createMock(ProductModel::class);
         }
         return $product;
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
@@ -13,10 +13,10 @@
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
 use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory as EavAttributeFactory;
-use Magento\Store\Test\Unit\Helper\StoreInterfaceTestHelper;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
 use Magento\Eav\Api\Data\AttributeGroupInterface;
 use Magento\Eav\Model\Config;
+use Magento\Eav\Test\Unit\Helper\AttributeGroupInterfaceTestHelper;
 use Magento\Eav\Model\Entity\Attribute\Group;
 use Magento\Eav\Model\Entity\Attribute\Source\SourceInterface;
 use Magento\Eav\Model\Entity\Type as EntityType;
@@ -42,6 +42,7 @@
 use Magento\Ui\DataProvider\EavValidationRules;
 use Magento\Ui\DataProvider\Mapper\FormElement as FormElementMapper;
 use Magento\Ui\DataProvider\Mapper\MetaProperties as MetaPropertiesMapper;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
@@ -130,6 +131,11 @@ class EavTest extends AbstractModifierTestCase
      * @var SearchCriteria|MockObject
      */
     private $searchCriteriaMock;
+    
+    /**
+     * @var SearchResultsInterface|MockObject
+     */
+    private $attributeGroupSearchResultsMock;
 
     /**
      * @var SortOrderBuilder|MockObject
@@ -152,7 +158,7 @@ class EavTest extends AbstractModifierTestCase
     private $searchResultsMock;
 
     /**
-     * @var Attribute|MockObject
+     * @var Attribute
      */
     private $eavAttributeMock;
 
@@ -172,7 +178,7 @@ class EavTest extends AbstractModifierTestCase
     protected $currencyLocaleMock;
 
     /**
-     * @var ProductAttributeInterface|MockObject
+     * @var Attribute
      */
     protected $productAttributeMock;
 
@@ -229,23 +235,34 @@ protected function setUp(): void
         $this->metaPropertiesMapperMock = $this->createMock(MetaPropertiesMapper::class);
         $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
         $this->attributeGroupRepositoryMock = $this->createMock(ProductAttributeGroupRepositoryInterface::class);
-        $this->attributeGroupMock = $this->createMock(AttributeGroupInterface::class);
+        $this->attributeGroupMock = $this->createPartialMock(
+            AttributeGroupInterfaceTestHelper::class,
+            ['getAttributeGroupCode']
+        );
         $this->attributeRepositoryMock = $this->createMock(ProductAttributeRepositoryInterface::class);
-        $this->searchCriteriaMock = $this->createPartialMock(SearchCriteria::class, ['getItems']);
+        $this->searchCriteriaMock = $this->createMock(SearchCriteria::class);
+        $this->attributeGroupSearchResultsMock = $this->createMock(SearchResultsInterface::class);
         $this->sortOrderBuilderMock = $this->createMock(SortOrderBuilder::class);
         $this->searchResultsMock = $this->createMock(SearchResultsInterface::class);
         $this->eavAttributeMock = $this->createPartialMock(
             Attribute::class,
             [
-                'load',
                 'getApplyTo',
                 'getFrontendInput',
                 'getAttributeCode',
                 'usesSource',
                 'getSource',
             ]
         );
-        $this->productAttributeMock = $this->createMock(ProductAttributeInterface::class);
+        $this->productAttributeMock = $this->createPartialMock(
+            Attribute::class,
+            [
+                'getIsRequired',
+                'getDefaultValue',
+                'getAttributeCode',
+                'getFrontendInput',
+            ]
+        );
         $this->arrayManagerMock = $this->createMock(ArrayManager::class);
         $this->eavAttributeFactoryMock = $this->createPartialMock(
             EavAttributeFactory::class,
@@ -283,13 +300,13 @@ protected function setUp(): void
         $this->entityTypeMock->expects($this->any())
             ->method('getAttributeCollection')
             ->willReturn($this->attributeCollectionMock);
-        $this->productMock->expects($this->any())
-            ->method('getAttributes')
-            ->willReturn([$this->attributeMock]);
-        $this->storeMock = $this->createPartialMock(StoreInterfaceTestHelper::class, ['getId']);
-        $this->eavAttributeMock->expects($this->any())
-            ->method('load')
-            ->willReturnSelf();
+        $this->storeMock = $this->createMock(StoreInterface::class);
+        $this->storeManagerMock->expects($this->any())
+            ->method('isSingleStoreMode')
+            ->willReturn(true);
+        $this->attributeGroupMock->expects($this->any())
+            ->method('getAttributeGroupCode')
+            ->willReturn('product-details');
 
         $this->eav =$this->getModel();
     }
@@ -347,15 +364,18 @@ public function testModifyData()
             ->willReturn(4);
         $this->productMock->expects($this->once())->method('getData')
             ->with(ProductAttributeInterface::CODE_PRICE)->willReturn('19.9900');
+        $this->productMock->expects($this->any())
+            ->method('getAttributes')
+            ->willReturn([$this->attributeMock]);
 
         $this->searchCriteriaBuilderMock->expects($this->any())->method('addFilter')
             ->willReturnSelf();
         $this->searchCriteriaBuilderMock->expects($this->any())->method('create')
             ->willReturn($this->searchCriteriaMock);
-        $this->attributeGroupRepositoryMock->expects($this->any())->method('getList')
-            ->willReturn($this->searchCriteriaMock);
-        $this->searchCriteriaMock->expects($this->once())->method('getItems')
+        $this->attributeGroupSearchResultsMock->method('getItems')
             ->willReturn([$this->attributeGroupMock]);
+        $this->attributeGroupRepositoryMock->expects($this->any())->method('getList')
+            ->willReturn($this->attributeGroupSearchResultsMock);
         $this->sortOrderBuilderMock->expects($this->once())->method('setField')
             ->willReturnSelf();
         $this->sortOrderBuilderMock->expects($this->once())->method('setAscendingDirection')
@@ -374,8 +394,6 @@ public function testModifyData()
         $this->attributeRepositoryMock->expects($this->once())->method('getList')
             ->with($this->searchCriteriaMock)
             ->willReturn($this->searchResultsMock);
-        $this->eavAttributeMock->expects($this->any())->method('getAttributeGroupCode')
-            ->willReturn('product-details');
         $this->eavAttributeMock->expects($this->once())->method('getApplyTo')
             ->willReturn([]);
         $this->eavAttributeMock->expects($this->once())->method('getFrontendInput')
@@ -398,8 +416,8 @@ public function testModifyData()
      * @param array $expectedCustomize
      * @covers       \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::isProductExists
      * @covers       \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::setupAttributeMeta
-     * @dataProvider setupAttributeMetaDataProvider
      */
+    #[DataProvider('setupAttributeMetaDataProvider')]
     public function testSetupAttributeMetaDefaultAttribute(
         $productId,
         bool $productRequired,
@@ -432,17 +450,15 @@ public function testSetupAttributeMetaDefaultAttribute(
         $this->productAttributeMock->method('getIsRequired')->willReturn($productRequired);
         $this->productAttributeMock->method('getDefaultValue')->willReturn('required_value');
         $this->productAttributeMock->method('getAttributeCode')->willReturn('code');
-        $this->productAttributeMock->method('getValue')->willReturn('value');
         $this->productAttributeMock->method('getFrontendInput')->willReturn($frontendInput);
 
-        $attributeMock = $this->createPartialMock(AttributeInterface::class, ['getValue']);
-
+        $attributeMock = $this->createStub(AttributeInterface::class);
         $attributeMock->method('getValue')->willReturn($attrValue);
 
         $this->productMock->method('getCustomAttribute')->willReturn($attributeMock);
         $this->eavAttributeMock->method('usesSource')->willReturn(true);
 
-        $attributeSource = $this->createMock(SourceInterface::class);
+        $attributeSource = $this->createStub(SourceInterface::class);
         $attributeSource->method('getAllOptions')->willReturn($attributeOptions);
 
         $this->eavAttributeMock->method('getSource')->willReturn($attributeSource);
diff --git a/app/code/Magento/Eav/Test/Unit/Helper/AttributeGroupInterfaceTestHelper.php b/app/code/Magento/Eav/Test/Unit/Helper/AttributeGroupInterfaceTestHelper.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Adobe, Inc. All rights reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Test\Unit\Helper;
+
+use Magento\Eav\Model\Entity\Attribute\Group;
+
+/**
+ * Test helper for AttributeGroupInterface providing extension attribute methods
+ */
+class AttributeGroupInterfaceTestHelper extends Group
+{
+    private string $attributeGroupCode = '';
+
+    public function __construct()
+    {
+        // Skip parent constructor to avoid dependency injection issues
+    }
+
+    public function getAttributeGroupCode()
+    {
+        return $this->attributeGroupCode;
+    }
+
+    public function setAttributeGroupCode($value)
+    {
+        $this->attributeGroupCode = $value;
+        return $this;
+    }
+}
+
