AC-15399::[CE] PHPUnit 12: Upgrade Wishlist & Rating related test | Refactoring

cod43156 · cod43156 · commit 4c6d65cbcf81 · 2025-10-16T22:35:55.000+05:30
diff --git a/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/MediaGalleryTest.php b/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/MediaGalleryTest.php
@@ -13,7 +13,6 @@
 use Magento\CatalogGraphQl\Model\Resolver\Product\MediaGallery;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -48,7 +47,7 @@ class MediaGalleryTest extends TestCase
     protected function setUp(): void
     {
         $this->fieldMock = $this->createMock(Field::class);
-        $this->contextMock = $this->createMock(ContextInterface::class);
+        $this->contextMock = $this->getMockForAbstractClass(ContextInterface::class);
         $this->infoMock = $this->createMock(ResolveInfo::class);
         $this->productMock = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
@@ -57,12 +56,12 @@ protected function setUp(): void
     }
 
     /**
+     * @dataProvider dataProviderForResolve
      * @param $expected
      * @param $productName
      * @return void
      * @throws Exception
      */
-    #[DataProvider('dataProviderForResolve')]
     public function testResolve($expected, $productName): void
     {
         $existingEntryMock = $this->getMockBuilder(Entry::class)
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php
@@ -70,7 +70,7 @@ class GetByIdExceptionDuringMediaAssetInitializationTest extends TestCase
     protected function setUp(): void
     {
         $resourceConnection = $this->createMock(ResourceConnection::class);
-        $this->assetFactory = $this->createMock(AssetInterfaceFactory::class); // @phpstan-ignore-line
+        $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);
         $this->logger = $this->createMock(LoggerInterface::class);
 
         $this->getMediaAssetById = (new ObjectManager($this))->getObject(
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionNoSuchEntityTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionNoSuchEntityTest.php
@@ -57,7 +57,7 @@ class GetByIdExceptionNoSuchEntityTest extends TestCase
     protected function setUp(): void
     {
         $resourceConnection = $this->createMock(ResourceConnection::class);
-        $this->assetFactory = $this->createMock(AssetInterfaceFactory::class); // @phpstan-ignore-line
+        $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);
         $logger = $this->createMock(LoggerInterface::class);
 
         $this->getMediaAssetById = (new ObjectManager($this))->getObject(
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php
@@ -70,7 +70,7 @@ class GetByIdExceptionOnGetDataTest extends TestCase
     protected function setUp(): void
     {
         $resourceConnection = $this->createMock(ResourceConnection::class);
-        $assetFactory = $this->createMock(AssetInterfaceFactory::class); // @phpstan-ignore-line
+        $assetFactory = $this->createMock(AssetInterfaceFactory::class);
         $this->logger = $this->createMock(LoggerInterface::class);
 
         $this->getMediaAssetById = (new ObjectManager($this))->getObject(
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php
@@ -71,7 +71,7 @@ class GetByIdSuccessfulTest extends TestCase
     protected function setUp(): void
     {
         $resourceConnection = $this->createMock(ResourceConnection::class);
-        $this->assetFactory = $this->createMock(AssetInterfaceFactory::class); // @phpstan-ignore-line
+        $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);
         $logger = $this->createMock(LoggerInterface::class);
 
         $this->getMediaAssetById = (new ObjectManager($this))->getObject(
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/GetAssetKeywordsTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/GetAssetKeywordsTest.php
@@ -44,7 +44,7 @@ class GetAssetKeywordsTest extends TestCase
     protected function setUp(): void
     {
         $this->resourceConnectionStub = $this->createMock(ResourceConnection::class);
-        $this->assetKeywordFactoryStub = $this->createMock(KeywordInterfaceFactory::class); // @phpstan-ignore-line
+        $this->assetKeywordFactoryStub = $this->createMock(KeywordInterfaceFactory::class);
         $this->loggerMock = $this->createMock(LoggerInterface::class);
 
         $this->sut = new GetAssetKeywords(
diff --git a/app/code/Magento/MediaGalleryUi/Test/Unit/Model/ConfigTest.php b/app/code/Magento/MediaGalleryUi/Test/Unit/Model/ConfigTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2018 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/DatabaseTestHelper.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/DatabaseTestHelper.php
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/DirectoryDatabaseTestHelper.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/DirectoryDatabaseTestHelper.php
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/Asset/Plugin/CleanMergedJsCssTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/Asset/Plugin/CleanMergedJsCssTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2018 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/Config/Source/Storage/Media/DatabaseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/Config/Source/Storage/Media/DatabaseTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2018 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/Directory/DatabaseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/Directory/DatabaseTest.php
@@ -15,7 +15,6 @@
 use Magento\MediaStorage\Model\File\Storage;
 use Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory;
 use Magento\MediaStorage\Model\ResourceModel\File\Storage\Directory\Database;
-use Magento\MediaStorage\Test\Unit\Helper\DirectoryDatabaseTestHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -86,9 +85,24 @@ protected function setUp(): void
         $this->registryMock = $this->createMock(Registry::class);
         $this->helperStorageDatabase = $this->createMock(DatabaseHelper::class);
         $this->dateModelMock = $this->createMock(DateTime::class);
-        $this->directoryMock = new DirectoryDatabaseTestHelper();
+        
+        // Use reflection to set data instead of helper
+        $this->directoryMock = $this->createPartialMock(
+            \Magento\MediaStorage\Model\File\Storage\Directory\Database::class,
+            ['save']
+        );
+        $reflection = new \ReflectionClass($this->directoryMock);
+        $dataProperty = $reflection->getProperty('_data');
+        $dataProperty->setAccessible(true);
+        $dataProperty->setValue($this->directoryMock, [
+            'path' => '',
+            'name' => '',
+            'parent_id' => 1
+        ]);
+        $this->directoryMock->method('save')->willReturnSelf();
+        
         $this->directoryFactoryMock = $this->createPartialMock(
-            DatabaseFactory::class, // @phpstan-ignore-line
+            DatabaseFactory::class,
             ['create']
         );
         $this->resourceDirectoryDatabaseMock = $this->createMock(
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/SynchronizationTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/SynchronizationTest.php
@@ -13,18 +13,27 @@
 use Magento\MediaStorage\Model\File\Storage\Database;
 use Magento\MediaStorage\Model\File\Storage\DatabaseFactory;
 use Magento\MediaStorage\Model\File\Storage\Synchronization;
-use Magento\MediaStorage\Test\Unit\Helper\DatabaseTestHelper;
 use PHPUnit\Framework\TestCase;
 
 class SynchronizationTest extends TestCase
 {
-    public function testSynchronize()
+    public function testSynchronize(): void
     {
         $content = 'content';
         $relativeFileName = 'config.xml';
 
-        $storageFactoryMock = $this->createPartialMock(DatabaseFactory::class, ['create']); // @phpstan-ignore-line
-        $storageMock = new DatabaseTestHelper();
+        $storageFactoryMock = $this->createPartialMock(DatabaseFactory::class, ['create']);
+        
+        $storageMock = $this->createPartialMock(Database::class, ['loadByFilename']);
+        $reflection = new \ReflectionClass($storageMock);
+        $dataProperty = $reflection->getProperty('_data');
+        $dataProperty->setAccessible(true);
+        $dataProperty->setValue($storageMock, [
+            'id' => true,
+            'content' => $content
+        ]);
+        $storageMock->method('loadByFilename')->willReturnSelf();
+        
         $storageFactoryMock->expects($this->once())->method('create')->willReturn($storageMock);
 
         $file = $this->createPartialMock(
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Service/ImageResizeTest.php b/app/code/Magento/MediaStorage/Test/Unit/Service/ImageResizeTest.php
@@ -151,7 +151,7 @@ protected function setUp(): void
         $this->viewMock = $this->createMock(View::class);
         $this->viewConfigMock = $this->createMock(ViewConfig::class);
         $this->assetImageMock = $this->createMock(AssetImage::class);
-        $this->assetImageFactoryMock = $this->createMock(AssetImageFactory::class); // @phpstan-ignore-line
+        $this->assetImageFactoryMock = $this->createMock(AssetImageFactory::class);
         $this->themeCustomizationConfigMock = $this->createMock(ThemeCustomizationConfig::class);
         $this->themeCollectionMock = $this->createMock(Collection::class);
         $this->filesystemMock = $this->createMock(Filesystem::class);
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/Helper/AbstractDbTestHelper.php b/lib/internal/Magento/Framework/Model/Test/Unit/Helper/AbstractDbTestHelper.php
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/Helper/AbstractModelTestHelper.php b/lib/internal/Magento/Framework/Model/Test/Unit/Helper/AbstractModelTestHelper.php

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class GetByIdExceptionDuringMediaAssetInitializationTest extends TestCase`
`70`	`70`	`protected function setUp(): void`
`71`	`71`	`{`
`72`	`72`	`$resourceConnection = $this->createMock(ResourceConnection::class);`
`73`		`- $this->assetFactory = $this->createMock(AssetInterfaceFactory::class); // @phpstan-ignore-line`
	`73`	`+ $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);`
`74`	`74`	`$this->logger = $this->createMock(LoggerInterface::class);`
`75`	`75`
`76`	`76`	`$this->getMediaAssetById = (new ObjectManager($this))->getObject(`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class GetByIdExceptionNoSuchEntityTest extends TestCase`
`57`	`57`	`protected function setUp(): void`
`58`	`58`	`{`
`59`	`59`	`$resourceConnection = $this->createMock(ResourceConnection::class);`
`60`		`- $this->assetFactory = $this->createMock(AssetInterfaceFactory::class); // @phpstan-ignore-line`
	`60`	`+ $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);`
`61`	`61`	`$logger = $this->createMock(LoggerInterface::class);`
`62`	`62`
`63`	`63`	`$this->getMediaAssetById = (new ObjectManager($this))->getObject(`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class GetByIdSuccessfulTest extends TestCase`
`71`	`71`	`protected function setUp(): void`
`72`	`72`	`{`
`73`	`73`	`$resourceConnection = $this->createMock(ResourceConnection::class);`
`74`		`- $this->assetFactory = $this->createMock(AssetInterfaceFactory::class); // @phpstan-ignore-line`
	`74`	`+ $this->assetFactory = $this->createMock(AssetInterfaceFactory::class);`
`75`	`75`	`$logger = $this->createMock(LoggerInterface::class);`
`76`	`76`
`77`	`77`	`$this->getMediaAssetById = (new ObjectManager($this))->getObject(`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class GetAssetKeywordsTest extends TestCase`
`44`	`44`	`protected function setUp(): void`
`45`	`45`	`{`
`46`	`46`	`$this->resourceConnectionStub = $this->createMock(ResourceConnection::class);`
`47`		`- $this->assetKeywordFactoryStub = $this->createMock(KeywordInterfaceFactory::class); // @phpstan-ignore-line`
	`47`	`+ $this->assetKeywordFactoryStub = $this->createMock(KeywordInterfaceFactory::class);`
`48`	`48`	`$this->loggerMock = $this->createMock(LoggerInterface::class);`
`49`	`49`
`50`	`50`	`$this->sut = new GetAssetKeywords(`