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

 - Addressed the CR comments.

Author: devarul

app/code/Magento/Catalog/Model/Product/Image/RemoveDeletedImagesFromCache.php

@@ -94,6 +94,8 @@ public function removeDeletedImagesFromCache(array $files): void
                 Image::MEDIA_TYPE_CONFIG_NODE
             );
 
+        $catalogPath = $this->mediaConfig->getBaseMediaPath();
+
         foreach ($images as $imageData) {
             $imageMiscParams = $this->imageParamsBuilder->build($imageData);
 
@@ -107,8 +109,6 @@ public function removeDeletedImagesFromCache(array $files): void
                 Encryptor::HASH_VERSION_MD5
             );
 
-            $catalogPath = $this->mediaConfig->getBaseMediaPath();
-
             foreach ($files as $filePath) {
                 $this->mediaDirectory->delete(
                     $catalogPath . '/cache/' . $cacheId . '/' . $filePath

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

@@ -66,17 +66,11 @@ class RemoveDeletedImagesFromCacheTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->presentationConfig = $this->getMockBuilder(ConfigInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->presentationConfig = $this->createMock(ConfigInterface::class);
 
-        $this->encryptor = $this->getMockBuilder(EncryptorInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->encryptor = $this->createMock(EncryptorInterface::class);
 
-        $this->mediaConfig = $this->getMockBuilder(Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->mediaConfig = $this->createMock(Config::class);
 
         $this->mediaDirectory = $this->createMock(Write::class);
 
@@ -85,14 +79,10 @@ protected function setUp(): void
             ->method('getDirectoryWrite')
             ->willReturn($this->mediaDirectory);
 
-        $this->imageParamsBuilder = $this->getMockBuilder(ParamsBuilder::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->imageParamsBuilder = $this->createMock(ParamsBuilder::class);
 
         $this->convertImageMiscParamsToReadableFormat = $this
-            ->getMockBuilder(ConvertImageMiscParamsToReadableFormat::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            ->createMock(ConvertImageMiscParamsToReadableFormat::class);
 
         $this->model = new RemoveDeletedImagesFromCache(
             $this->presentationConfig,
@@ -103,9 +93,7 @@ protected function setUp(): void
             $this->convertImageMiscParamsToReadableFormat
         );
 
-        $this->viewMock = $this->getMockBuilder(View::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->viewMock = $this->createMock(View::class);
     }
 
     /**