AC-15047::[CE] PHPUnit 12: Upgrade Media & Asset Management related test cases | PHPUnit12 Compatibility

cod43156 · cod43156 · commit fbed91c39dde · 2025-09-19T14:15:56.000+05:30
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/DeleteByDirectoryPathTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/DeleteByDirectoryPathTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\MediaGallery\Model\Asset\Command\DeleteByDirectoryPath;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -68,8 +69,8 @@ protected function setUp(): void
      *
      * @param string $directoryPath
      * @throws CouldNotDeleteException
-     * @dataProvider directoryPathDataProvider
      */
+    #[DataProvider('directoryPathDataProvider')]
     public function testDeleteByDirectoryPath(string $directoryPath): void
     {
         if (!empty($directoryPath)) {
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
@@ -14,6 +14,7 @@
 use Magento\MediaGallery\Model\Keyword\Command\GetAssetKeywords;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterfaceFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -56,10 +57,10 @@ protected function setUp(): void
     /**
      * Posive test for the main case
      *
-     * @dataProvider casesProvider
      * @param array $databaseQueryResult
      * @param int $expectedNumberOfFoundKeywords
      */
+    #[DataProvider('casesProvider')]
     public function testFind(array $databaseQueryResult, int $expectedNumberOfFoundKeywords): void
     {
         $randomAssetId = 12345;
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetKeywordsTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Keyword/Command/SaveAssetKeywordsTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\MediaGallery\Model\Keyword\Command\SaveAssetKeywords;
 use Magento\MediaGallery\Model\ResourceModel\Keyword\SaveAssetLinks;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -71,12 +72,11 @@ protected function setUp(): void
     /**
      * Test saving the asset keywords
      *
-     * @dataProvider assetKeywordsDataProvider
-     *
      * @param array $keywords
      * @param int $assetId
      * @param array $items
      */
+    #[DataProvider('assetKeywordsDataProvider')]
     public function testAssetKeywordsSave(array $keywords, int $assetId, array $items): void
     {
         $expectedCalls = (int) (count($keywords));
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/DeleteAssetsByPathsTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/DeleteAssetsByPathsTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\MediaGallery\Model\ResourceModel\DeleteAssetsByPaths;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -43,9 +44,9 @@ class DeleteAssetsByPathsTest extends TestCase
     /**
      * When deleting an asset by path with mixed case, the asset with exact same path should be deleted
      *
-     * @dataProvider assetDeleteByPathDataProvider
      * @throws CouldNotDeleteException
      */
+    #[DataProvider('assetDeleteByPathDataProvider')]
     public function testDeleteCorrectAssetByPathWithCaseSensitiveMatches(
         array  $assets,
         string $assetPathToDelete,
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/GetAssetsByPathsTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/GetAssetsByPathsTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\DB\Select;
 use Magento\MediaGallery\Model\ResourceModel\GetAssetsByPaths;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -72,9 +73,8 @@ protected function setUp(): void
 
     /**
      * When getting an asset by path with mixed case, the asset with exact same path should be loaded
-     *
-     * @dataProvider assetDeleteByPathDataProvider
      */
+    #[DataProvider('assetDeleteByPathDataProvider')]
     public function testGetCorrectAssetByPathWithCaseSensitiveMatches(
         array $assets,
         int $assetIndex,
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\MediaGallery\Model\ResourceModel\Keyword\SaveAssetLinks;
 use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -63,13 +64,12 @@ protected function setUp(): void
     /**
      * Test saving the asset keyword links
      *
-     * @dataProvider assetLinksDataProvider
-     *
      * @param int $assetId
      * @param array $keywordIds
      * @param array $values
      * @throws CouldNotSaveException
      */
+    #[DataProvider('assetLinksDataProvider')]
     public function testAssetKeywordsSave(int $assetId, array $keywordIds, array $values): void
     {
         $expectedCalls = (int) (count($keywordIds));
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Plugin/Wysiwyg/Images/StorageTest.php b/app/code/Magento/MediaGallery/Test/Unit/Plugin/Wysiwyg/Images/StorageTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\MediaGallery\Plugin\Wysiwyg\Images\Storage as StoragePlugin;
 use Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -83,9 +84,8 @@ protected function setUp(): void
 
     /**
      * @param string $path
-     *
-     * @dataProvider pathPathDataProvider
      */
+    #[DataProvider('pathPathDataProvider')]
     public function testAfterDeleteDirectory($path): void
     {
         $directoryRead = $this->createMock(ReadInterface::class);
diff --git a/app/code/Magento/MediaGalleryUi/Test/Unit/Model/Model/Directories/GetDirectoryTreeTest.php b/app/code/Magento/MediaGalleryUi/Test/Unit/Model/Model/Directories/GetDirectoryTreeTest.php
@@ -13,6 +13,7 @@
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
 use Magento\MediaGalleryUi\Model\Directories\GetDirectoryTree;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -102,8 +103,8 @@ protected function setUp(): void
      * @param array $allowedFolders
      * @param array $expected
      * @throws ValidatorException
-     * @dataProvider executeDataProvider
      */
+    #[DataProvider('executeDataProvider')]
     public function testExecute(array $allowedFolders, array $expected): void
     {
         $directory = $this->createMock(ReadInterface::class);
diff --git a/app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php b/app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Filesystem\Directory\Read;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\MediaGalleryUi\Model\UploadImage;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -66,9 +67,8 @@ protected function setUp(): void
      * @param string $targetFolder
      * @param string|null $type
      * @param string $absolutePath
-     *
-     * @dataProvider executeDataProvider
      */
+    #[DataProvider('executeDataProvider')]
     public function testExecute(string $targetFolder, ?string $type, string $absolutePath): void
     {
         $this->fileSystemMock->expects($this->once())
diff --git a/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php b/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php
@@ -27,6 +27,7 @@
 use Magento\MediaStorage\Model\File\Storage\Synchronization;
 use Magento\MediaStorage\Model\File\Storage\SynchronizationFactory;
 use Magento\MediaStorage\Service\ImageResize;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -196,9 +197,8 @@ public function testProcessRequestReturnsNotFoundIfFileIsNotSynchronized(): void
     /**
      * @param bool $isDeveloper
      * @param int $setBodyCalls
-     *
-     * @dataProvider catchExceptionDataProvider
      */
+    #[DataProvider('catchExceptionDataProvider')]
     public function testCatchException(bool $isDeveloper, int $setBodyCalls): void
     {
         /** @var Bootstrap|MockObject $bootstrap */
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/MediaTest.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/MediaTest.php
@@ -13,6 +13,7 @@
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\MediaStorage\Helper\File\Media;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -54,8 +55,8 @@ protected function setUp(): void
      * @param string $path
      * @param string $expectedDir
      * @param string $expectedFile
-     * @dataProvider pathDataProvider
      */
+    #[DataProvider('pathDataProvider')]
     public function testCollectFileInfo($path, $expectedDir, $expectedFile)
     {
         $content = 'content';
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php
@@ -19,6 +19,7 @@
 use Magento\MediaStorage\Model\File\Storage;
 use Magento\MediaStorage\Model\File\Storage\DatabaseFactory;
 use Magento\MediaStorage\Model\File\Storage\File;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -78,8 +79,8 @@ protected function setUp(): void
     /**
      * @param int $storage
      * @param bool $expected
-     * @dataProvider checkDbUsageDataProvider
      */
+    #[DataProvider('checkDbUsageDataProvider')]
     public function testCheckDbUsage($storage, $expected)
     {
         $this->configMock->expects($this->once())
@@ -135,8 +136,8 @@ public function testGetResourceStorageModel()
     /**
      * @param int $storage
      * @param int $callNum
-     * @dataProvider updateFileDataProvider
      */
+    #[DataProvider('updateFileDataProvider')]
     public function testSaveFile($storage, $callNum)
     {
         $this->configMock->expects($this->once())
@@ -168,8 +169,8 @@ public static function updateFileDataProvider()
     /**
      * @param int $storage
      * @param int $callNum
-     * @dataProvider updateFileDataProvider
      */
+    #[DataProvider('updateFileDataProvider')]
     public function testRenameFile($storage, $callNum)
     {
         $this->configMock->expects($this->once())
@@ -190,8 +191,8 @@ public function testRenameFile($storage, $callNum)
     /**
      * @param int $storage
      * @param int $callNum
-     * @dataProvider updateFileDataProvider
      */
+    #[DataProvider('updateFileDataProvider')]
     public function testCopyFile($storage, $callNum)
     {
         $this->configMock->expects($this->once())
@@ -213,8 +214,8 @@ public function testCopyFile($storage, $callNum)
      * @param int $storage
      * @param int $callNum
      * @param bool|null $expected
-     * @dataProvider fileExistsDataProvider
      */
+    #[DataProvider('fileExistsDataProvider')]
     public function testFileExists($storage, $callNum, $expected)
     {
         $this->configMock->expects($this->once())
@@ -248,8 +249,8 @@ public static function fileExistsDataProvider()
      * @param int $storage
      * @param int $callNum
      * @param string $expected
-     * @dataProvider getUniqueFilenameDataProvider
      */
+    #[DataProvider('getUniqueFilenameDataProvider')]
     public function testGetUniqueFilename($storage, $callNum, $expected)
     {
         $this->configMock->expects($this->once())
@@ -289,8 +290,8 @@ public static function getUniqueFilenameDataProvider()
      * @param int $callNum
      * @param int $id
      * @param int $callSaveFile
-     * @dataProvider saveFileToFileSystemDataProvider
      */
+    #[DataProvider('saveFileToFileSystemDataProvider')]
     public function testSaveFileToFileSystem($expected, $storage, $callNum, $id = 0, $callSaveFile = 0)
     {
         $this->configMock->expects($this->once())
@@ -346,8 +347,8 @@ public function testGetMediaRelativePath()
     /**
      * @param int $storage
      * @param int $callNum
-     * @dataProvider updateFileDataProvider
      */
+    #[DataProvider('updateFileDataProvider')]
     public function testDeleteFolder($storage, $callNum)
     {
         $this->configMock->expects($this->once())
@@ -380,8 +381,8 @@ public function deleteFolder($path)
     /**
      * @param int $storage
      * @param int $callNum
-     * @dataProvider updateFileDataProvider
      */
+    #[DataProvider('updateFileDataProvider')]
     public function testDeleteFile($storage, $callNum)
     {
         $this->configMock->expects($this->once())
@@ -405,8 +406,8 @@ public function testDeleteFile($storage, $callNum)
      * @param int $storage
      * @param int $callNum
      * @param int $callDirWrite
-     * @dataProvider saveUploadedFileDataProvider
      */
+    #[DataProvider('saveUploadedFileDataProvider')]
     public function testSaveUploadedFile($result, $expected, $expectedFullPath, $storage, $callNum, $callDirWrite = 0)
     {
         $this->configMock->expects($this->once())
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/StorageTest.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/StorageTest.php
@@ -14,6 +14,7 @@
 use Magento\MediaStorage\Helper\File\Storage;
 use Magento\MediaStorage\Helper\File\Storage\Database as DatabaseHelper;
 use Magento\MediaStorage\Model\File\Storage\File;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -74,8 +75,8 @@ public function testGetStorageFileModel()
      * @param int $storage
      * @param int $callNum
      * @param bool $expected
-     * @dataProvider isInternalStorageDataProvider
      */
+    #[DataProvider('isInternalStorageDataProvider')]
     public function testIsInternalStorage($storage, $callNum, $expected)
     {
         $currentStorage = '10';
@@ -114,8 +115,8 @@ public function testGetStorageModel()
      * @param int $callNum
      * @param int $callSaveFileNum
      * @param int $fileId
-     * @dataProvider processStorageFileDataProvider
      */
+    #[DataProvider('processStorageFileDataProvider')]
     public function testProcessStorageFile($expected, $storage, $callNum, $callSaveFileNum, $fileId = null)
     {
         $this->configMock->expects($this->once())
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Validator/ImageTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Validator/ImageTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Image as FrameworkImage;
 use Magento\Framework\Image\Factory;
 use Magento\MediaStorage\Model\File\Validator\Image;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -57,9 +58,7 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * @dataProvider dataProviderForIsValid
-     */
+    #[DataProvider('dataProviderForIsValid')]
     public function testIsValid($filePath, $mimeType, $result): void
     {
         $this->fileMimeMock->expects($this->once())
