Merge branch '2.4-develop' into spartans_pr_11112025

Author: magento-devops-queue-mgr-svc

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php

@@ -14,17 +14,21 @@
 use Magento\Catalog\Model\ResourceModel\ProductFactory;
 use Magento\CatalogImportExport\Model\Export\Product;
 use Magento\CatalogImportExport\Model\Export\Product\Type\Factory;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as AttributeCollectionFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory as OptionCollectionFactory;
 use Magento\CatalogImportExport\Model\Export\RowCustomizer\Composite;
 use Magento\CatalogImportExport\Model\Import\Product\StoreResolver;
 use Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Eav\Model\Config;
+use Magento\ImportExport\Model\Export\Config as ExportConfig;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Eav\Model\Entity\Type;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Logger\Monolog;
 use Magento\Framework\Stdlib\DateTime\Timezone;
+use Magento\Framework\TestFramework\Unit\Helper\MockCreationTrait;
 use Magento\ImportExport\Model\Export\Adapter\AbstractAdapter;
 use Magento\ImportExport\Model\Export\ConfigInterface;
 use Magento\Store\Model\Store;
@@ -39,6 +43,8 @@
  */
 class AdvancedPricingTest extends TestCase
 {
+    use MockCreationTrait;
+
     /**
      * @var Timezone|MockObject
      */
@@ -157,18 +163,13 @@ protected function setUp(): void
         $this->localeDate = $this->createMock(Timezone::class);
         $this->config = $this->createPartialMock(Config::class, ['getEntityType']);
         $type = $this->createMock(Type::class);
-        $this->config->expects($this->once())->method('getEntityType')->willReturn($type);
+        $this->config->method('getEntityType')->willReturn($type);
         $this->resource = $this->createMock(ResourceConnection::class);
         $this->storeManager = $this->createMock(StoreManager::class);
         $this->logger = $this->createMock(Monolog::class);
         $this->collection = $this->createMock(CollectionFactory::class);
-        $this->abstractCollection = $this->getMockForAbstractClass(
+        $this->abstractCollection = $this->createPartialMockWithReflection(
             AbstractCollection::class,
-            [],
-            '',
-            false,
-            true,
-            true,
             [
                 'count',
                 'setOrder',
@@ -177,29 +178,22 @@ protected function setUp(): void
                 'getLastPageNumber',
             ]
         );
-        $this->exportConfig = $this->createMock(\Magento\ImportExport\Model\Export\Config::class);
-        $this->productFactory = $this->getMockBuilder(ProductFactory::class)
-            ->addMethods(['getTypeId'])
-            ->onlyMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->attrSetColFactory = $this->getMockBuilder(AttributeSetCollectionFactory::class)
-            ->addMethods(['setEntityTypeFilter'])
-            ->onlyMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->categoryColFactory = $this->getMockBuilder(CategoryCollectionFactory::class)
-            ->addMethods(['addNameToResult'])
-            ->onlyMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->itemFactory = $this->createMock(ItemFactory::class);
-        $this->optionColFactory = $this->createMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Option\CollectionFactory::class
+        $this->exportConfig = $this->createMock(ExportConfig::class);
+        $this->productFactory = $this->createPartialMockWithReflection(
+            ProductFactory::class,
+            ['getTypeId', 'create']
+        );
+        $this->attrSetColFactory = $this->createPartialMockWithReflection(
+            AttributeSetCollectionFactory::class,
+            ['setEntityTypeFilter', 'create']
         );
-        $this->attributeColFactory = $this->createMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class
+        $this->categoryColFactory = $this->createPartialMockWithReflection(
+            CategoryCollectionFactory::class,
+            ['addNameToResult', 'create']
         );
+        $this->itemFactory = $this->createMock(ItemFactory::class);
+        $this->optionColFactory = $this->createMock(OptionCollectionFactory::class);
+        $this->attributeColFactory = $this->createMock(AttributeCollectionFactory::class);
         $this->typeFactory = $this->createMock(Factory::class);
         $this->linkTypeProvider = $this->createMock(LinkTypeProvider::class);
         $this->rowCustomizer = $this->createMock(
@@ -208,7 +202,7 @@ protected function setUp(): void
         $this->storeResolver = $this->createMock(
             StoreResolver::class
         );
-        $this->groupRepository = $this->getMockForAbstractClass(GroupRepositoryInterface::class);
+        $this->groupRepository = $this->createMock(GroupRepositoryInterface::class);
         $this->writer = $this->createPartialMock(
             AbstractAdapter::class,
             [
@@ -242,36 +236,31 @@ protected function setUp(): void
             '_getCustomerGroupById',
             'correctExportData'
         ]);
-        $this->advancedPricing = $this->getMockBuilder(
-            AdvancedPricing::class
-        )
-            ->addMethods($mockAddMethods)
-            ->onlyMethods($mockMethods)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->advancedPricing = $this->createPartialMockWithReflection(
+            AdvancedPricing::class,
+            array_merge($mockAddMethods, $mockMethods)
+        );
+        
+        // Configure constructor methods to return self
         foreach ($constructorMethods as $method) {
-            $this->advancedPricing->expects($this->once())->method($method)->willReturnSelf();
+            $this->advancedPricing->method($method)->willReturnSelf();
         }
-        $this->advancedPricing->__construct(
-            $this->localeDate,
-            $this->config,
-            $this->resource,
-            $this->storeManager,
-            $this->logger,
-            $this->collection,
-            $this->exportConfig,
-            $this->productFactory,
-            $this->attrSetColFactory,
-            $this->categoryColFactory,
-            $this->itemFactory,
-            $this->optionColFactory,
-            $this->attributeColFactory,
-            $this->typeFactory,
-            $this->linkTypeProvider,
-            $this->rowCustomizer,
-            $this->storeResolver,
-            $this->groupRepository
-        );
+        
+        // Set properties directly using reflection instead of calling constructor
+        // to avoid parent constructor that needs ObjectManager
+        $reflection = new \ReflectionClass($this->advancedPricing);
+        
+        $storeResolverProperty = $reflection->getProperty('_storeResolver');
+        $storeResolverProperty->setAccessible(true);
+        $storeResolverProperty->setValue($this->advancedPricing, $this->storeResolver);
+        
+        $groupRepositoryProperty = $reflection->getProperty('_groupRepository');
+        $groupRepositoryProperty->setAccessible(true);
+        $groupRepositoryProperty->setValue($this->advancedPricing, $this->groupRepository);
+        
+        $resourceProperty = $reflection->getProperty('_resource');
+        $resourceProperty->setAccessible(true);
+        $resourceProperty->setValue($this->advancedPricing, $this->resource);
     }
 
     /**

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\AdvancedPricingImportExport\Test\Unit\Model\Import\AdvancedPricing\Validator;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as AdvancedPricing;
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator;
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator\TierPrice;
@@ -21,9 +22,13 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Json\Helper\Data;
 use Magento\Framework\Stdlib\StringUtils;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\ImportExport\Helper\Data as ImportExportHelperData;
 use Magento\ImportExport\Model\ResourceModel\Helper;
+use Magento\ImportExport\Model\ResourceModel\Import\Data as ResourceImportData;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use ReflectionClass;
 
 /**
  * @SuppressWarnings(PHPMD)
@@ -50,12 +55,15 @@ class TierPriceTest extends TestCase
      */
     protected $tierPrice;
 
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+
     protected function setUp(): void
     {
-        $this->groupRepository = $this->getMockBuilder(GroupRepositoryInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getList'])
-            ->getMockForAbstractClass();
+        $this->objectManager = new ObjectManager($this);
+        $this->groupRepository = $this->createMock(GroupRepositoryInterface::class);
 
         $this->searchCriteriaBuilder = $this->createMock(SearchCriteriaBuilder::class);
         $this->storeResolver = $this->createMock(
@@ -74,48 +82,33 @@ public function testInitInternalCalls()
     {
         $searchCriteria = $this->createMock(SearchCriteria::class);
         $this->searchCriteriaBuilder->method('create')->willReturn($searchCriteria);
-        $groupSearchResult = $this->getMockForAbstractClass(
-            GroupSearchResultsInterface::class,
-            [],
-            '',
-            false
-        );
+        $groupSearchResult = $this->createMock(GroupSearchResultsInterface::class);
         $this->groupRepository
             ->method('getList')
             ->with($searchCriteria)
             ->willReturn($groupSearchResult);
 
-        $groupTest = $this->getMockBuilder(GroupInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getCode', 'getId'])
-            ->getMockForAbstractClass();
+        $groupTest = $this->createMock(GroupInterface::class);
         $groupTest->expects($this->once())->method('getCode');
         $groupTest->method('getId');
         $groups = [$groupTest];
         $groupSearchResult->method('getItems')->willReturn($groups);
 
-        $this->tierPrice->init(null);
+        $productMock = $this->createMock(Product::class);
+        $this->tierPrice->init($productMock);
     }
 
     public function testInitAddToCustomerGroups()
     {
         $searchCriteria = $this->createMock(SearchCriteria::class);
         $this->searchCriteriaBuilder->method('create')->willReturn($searchCriteria);
-        $groupSearchResult = $this->getMockForAbstractClass(
-            GroupSearchResultsInterface::class,
-            [],
-            '',
-            false
-        );
+        $groupSearchResult = $this->createMock(GroupSearchResultsInterface::class);
         $this->groupRepository
             ->method('getList')
             ->with($searchCriteria)
             ->willReturn($groupSearchResult);
 
-        $groupTest = $this->getMockBuilder(GroupInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getCode', 'getId'])
-            ->getMockForAbstractClass();
+        $groupTest = $this->createMock(GroupInterface::class);
 
         $expectedCode = 'code';
         $expectedId = 'id';
@@ -127,65 +120,49 @@ public function testInitAddToCustomerGroups()
         $groups = [$groupTest];
         $groupSearchResult->method('getItems')->willReturn($groups);
 
-        $this->tierPrice->init(null);
+        $productMock = $this->createMock(Product::class);
+        $this->tierPrice->init($productMock);
 
-        $this->assertEquals($expectedCustomerGroups, $this->getPropertyValue($this->tierPrice, 'customerGroups'));
+        $reflection = new ReflectionClass($this->tierPrice);
+        $property = $reflection->getProperty('customerGroups');
+        $property->setAccessible(true);
+        $this->assertEquals($expectedCustomerGroups, $property->getValue($this->tierPrice));
     }
 
     public function testIsValidResultTrue()
     {
         $this->tierPrice->expects($this->once())->method('isValidValueAndLength')->willReturn(false);
-        $this->setPropertyValue($this->tierPrice, 'customerGroups', true);
+        $this->objectManager->setBackwardCompatibleProperty($this->tierPrice, 'customerGroups', true);
 
         $result = $this->tierPrice->isValid([]);
         $this->assertTrue($result);
     }
 
     /**
-     * @dataProvider isValidAddMessagesCallDataProvider
      *
      * @param array $value
      * @param bool  $hasEmptyColumns
      * @param array $customerGroups
      * @param array $expectedMessages
      */
+    #[DataProvider('isValidAddMessagesCallDataProvider')]
     public function testIsValidAddMessagesCall($value, $hasEmptyColumns, $customerGroups, $expectedMessages)
     {
-        $priceContextMock = $this->getMockBuilder(Product::class)
-            ->setConstructorArgs(
-                [
-                    Data::class,
-                    \Magento\ImportExport\Helper\Data::class,
-                    \Magento\ImportExport\Model\ResourceModel\Import\Data::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);
-        $this->setPropertyValue($this->tierPrice, 'customerGroups', $customerGroups);
+        $this->objectManager->setBackwardCompatibleProperty($this->tierPrice, 'customerGroups', $customerGroups);
 
         $searchCriteria = $this->createMock(SearchCriteria::class);
         $this->searchCriteriaBuilder->method('create')->willReturn($searchCriteria);
-        $groupSearchResult = $this->getMockForAbstractClass(
-            GroupSearchResultsInterface::class,
-            [],
-            '',
-            false
-        );
+        $groupSearchResult = $this->createMock(GroupSearchResultsInterface::class);
         $this->groupRepository
             ->method('getList')
             ->with($searchCriteria)
             ->willReturn($groupSearchResult);
 
-        $groupTest = $this->getMockBuilder(GroupInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getCode', 'getId'])
-            ->getMockForAbstractClass();
+        $groupTest = $this->createMock(GroupInterface::class);
         $groupTest->expects($this->once())->method('getCode');
         $groupTest->method('getId');
         $groups = [$groupTest];
@@ -353,40 +330,4 @@ public static function isValidAddMessagesCallDataProvider()
             ],
         ];
     }
-
-    /**
-     * Get any object property value.
-     *
-     * @param object $object
-     * @param string $property
-     * @return mixed
-     * @throws \ReflectionException
-     */
-    protected function getPropertyValue($object, $property)
-    {
-        $reflection = new \ReflectionClass(get_class($object));
-        $reflectionProperty = $reflection->getProperty($property);
-        $reflectionProperty->setAccessible(true);
-
-        return $reflectionProperty->getValue($object);
-    }
-
-    /**
-     * Set object property value.
-     *
-     * @param object $object
-     * @param string $property
-     * @param mixed $value
-     * @return object
-     * @throws \ReflectionException
-     */
-    protected function setPropertyValue(&$object, $property, $value)
-    {
-        $reflection = new \ReflectionClass(get_class($object));
-        $reflectionProperty = $reflection->getProperty($property);
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($object, $value);
-
-        return $object;
-    }
 }