ACP2E-2093: Issue when uploading image with the same name while deleting the old image

 - Fixed the CR comments.

Author: devarul

app/code/Magento/Catalog/Test/Unit/Model/Product/Image/ConvertImageMiscParamsToReadableFormatTest.php

@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Product\Image;
+
+use Magento\Catalog\Model\Product\Image\ConvertImageMiscParamsToReadableFormat;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test convert image misc params to readable format
+ */
+class ConvertImageMiscParamsToReadableFormatTest extends TestCase
+{
+    /**
+     * @var ConvertImageMiscParamsToReadableFormat|MockObject
+     */
+    protected ConvertImageMiscParamsToReadableFormat|MockObject $model;
+
+    protected function setUp(): void
+    {
+        $this->model = new ConvertImageMiscParamsToReadableFormat();
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     * @dataProvider createDataProvider
+     */
+    public function testConvertImageMiscParamsToReadableFormat(array $data): void
+    {
+        $this->assertEquals(
+            $data['expectedMiscParamsWithArray'],
+            $this->model->convertImageMiscParamsToReadableFormat($data['convertImageParamsToReadableFormatWithArray'])
+        );
+        $this->assertEquals(
+            $data['expectedMiscParamsWithOutArray'],
+            $this->model->convertImageMiscParamsToReadableFormat($data['convertImageParamsToReadableFormatWithOutArray'])
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function createDataProvider(): array
+    {
+        return [
+            $this->getTestDataWithAttributes()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    private function getTestDataWithAttributes(): array
+    {
+        return [
+            'data' => [
+                'convertImageParamsToReadableFormatWithArray' => [
+                    'image_height' => '50',
+                    'image_width' => '100',
+                    'quality' => '80',
+                    'angle' => '90',
+                    'keep_aspect_ratio' => 'proportional',
+                    'keep_frame' => 'frame',
+                    'keep_transparency' => 'transparency',
+                    'constrain_only' => 'constrainonly',
+                    'background' => [255,255,255]
+                ],
+                'convertImageParamsToReadableFormatWithOutArray' => [],
+                'expectedMiscParamsWithArray' => [
+                    'image_height' => 'h:50',
+                    'image_width' => 'w:100',
+                    'quality' => 'q:80',
+                    'angle' => 'r:90',
+                    'keep_aspect_ratio' => 'proportional',
+                    'keep_frame' => 'frame',
+                    'keep_transparency' => 'transparency',
+                    'constrain_only' => 'doconstrainonly',
+                    'background' => 'rgb255,255,255'
+                ],
+                'expectedMiscParamsWithOutArray' => [
+                    'image_height' => 'h:empty',
+                    'image_width' => 'w:empty',
+                    'quality' => 'q:empty',
+                    'angle' => 'r:empty',
+                    'keep_aspect_ratio' => 'nonproportional',
+                    'keep_frame' => 'noframe',
+                    'keep_transparency' => 'notransparency',
+                    'constrain_only' => 'notconstrainonly',
+                    'background' => 'nobackground'
+                ]
+            ]
+        ];
+    }
+}

app/code/Magento/Catalog/Test/Unit/Model/Product/Image/RemoveDeletedImagesFromCacheTest.php

@@ -13,6 +13,8 @@
 use Magento\Catalog\Model\Product\Media\Config;
 use Magento\Framework\Config\View;
 use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Phrase;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Write;
 use Magento\Framework\View\ConfigInterface;
@@ -25,44 +27,44 @@
 class RemoveDeletedImagesFromCacheTest extends TestCase
 {
     /**
-     * @var RemoveDeletedImagesFromCache|MockObject
+     * @var MockObject|RemoveDeletedImagesFromCache
      */
-    protected $model;
+    protected RemoveDeletedImagesFromCache|MockObject $model;
 
     /**
      * @var ConfigInterface|MockObject
      */
-    protected $presentationConfig;
+    protected ConfigInterface|MockObject $presentationConfig;
 
     /**
      * @var EncryptorInterface|MockObject
      */
-    protected $encryptor;
+    protected EncryptorInterface|MockObject $encryptor;
 
     /**
      * @var Config|MockObject
      */
-    protected $mediaConfig;
+    protected Config|MockObject $mediaConfig;
 
     /**
-     * @var Write|MockObject
+     * @var MockObject|Write
      */
-    protected $mediaDirectory;
+    protected Write|MockObject $mediaDirectory;
 
     /**
-     * @var ParamsBuilder|MockObject
+     * @var MockObject|ParamsBuilder
      */
-    protected $imageParamsBuilder;
+    protected ParamsBuilder|MockObject $imageParamsBuilder;
 
     /**
      * @var ConvertImageMiscParamsToReadableFormat|MockObject
      */
-    protected $convertImageMiscParamsToReadableFormat;
+    protected ConvertImageMiscParamsToReadableFormat|MockObject $convertImageMiscParamsToReadableFormat;
 
     /**
-     * @var View|MockObject
+     * @var MockObject|View
      */
-    protected $viewMock;
+    protected View|MockObject $viewMock;
 
     protected function setUp(): void
     {
@@ -102,6 +104,55 @@ protected function setUp(): void
      * @dataProvider createDataProvider
      */
     public function testRemoveDeletedImagesFromCache(array $data): void
+    {
+        $this->getRespectiveMethodMockObjForRemoveDeletedImagesFromCache($data);
+
+        $this->mediaDirectory->expects($this->once())
+            ->method('delete')
+            ->willReturn(true);
+
+        $this->model->removeDeletedImagesFromCache(['i/m/image.jpg']);
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     * @dataProvider createDataProvider
+     */
+    public function testRemoveDeletedImagesFromCacheWithException(array $data): void
+    {
+        $this->getRespectiveMethodMockObjForRemoveDeletedImagesFromCache($data);
+
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('Unable to write file into directory product/cache. Access forbidden.');
+
+        $exception = new FileSystemException(
+            new Phrase('Unable to write file into directory product/cache. Access forbidden.')
+        );
+
+        $this->mediaDirectory->expects($this->once())
+            ->method('delete')
+            ->willThrowException($exception);
+
+        $this->model->removeDeletedImagesFromCache(['i/m/image.jpg']);
+    }
+
+    /**
+     * @return void
+     */
+    public function testRemoveDeletedImagesFromCacheWithEmptyFiles(): void
+    {
+        $this->assertEquals(
+            null,
+            $this->model->removeDeletedImagesFromCache([])
+        );
+    }
+
+    /**
+     * @param array $data
+     * @return void
+     */
+    public function getRespectiveMethodMockObjForRemoveDeletedImagesFromCache(array $data): void
     {
         $this->presentationConfig->expects($this->once())
             ->method('getViewConfig')
@@ -127,12 +178,6 @@ public function testRemoveDeletedImagesFromCache(array $data): void
         $this->mediaConfig->expects($this->once())
             ->method('getBaseMediaPath')
             ->willReturn('catalog/product');
-
-        $this->mediaDirectory->expects($this->once())
-            ->method('delete')
-            ->willReturn(true);
-
-        $this->model->removeDeletedImagesFromCache(['i/m/image.jpg']);
     }
 
     /**