#28239: resize command does not process hidden images

- Fixed Unit Test
- Removed unnecessary dependency in the constructor

Author: BGorbach

app/code/Magento/MediaStorage/Console/Command/ImagesResizeCommand.php

@@ -18,7 +18,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Command\Command;
-use Magento\Catalog\Model\ResourceModel\Product\Image as ProductImage;
+
 
 /**
  * Resizes product images according to theme view definitions.
@@ -55,11 +55,6 @@ class ImagesResizeCommand extends Command
      */
     private $progressBarFactory;
 
-    /**
-     * @var ProductImage
-     */
-    private $productImage;
-
     /**
      * @var bool
      */
@@ -70,22 +65,19 @@ class ImagesResizeCommand extends Command
      * @param ImageResize $imageResize
      * @param ImageResizeScheduler $imageResizeScheduler
      * @param ProgressBarFactory $progressBarFactory
-     * @param ProductImage $productImage
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         State $appState,
         ImageResize $imageResize,
         ImageResizeScheduler $imageResizeScheduler,
-        ProgressBarFactory $progressBarFactory,
-        ProductImage $productImage
+        ProgressBarFactory $progressBarFactory
     ) {
         parent::__construct();
         $this->appState = $appState;
         $this->imageResize = $imageResize;
         $this->imageResizeScheduler = $imageResizeScheduler;
         $this->progressBarFactory = $progressBarFactory;
-        $this->productImage = $productImage;
     }
 
     /**

app/code/Magento/MediaStorage/Test/Unit/Service/ImageResizeTest.php

@@ -130,6 +130,11 @@ class ImageResizeTest extends TestCase
      */
     private $storeManager;
 
+    /**
+     * @var string
+     */
+    private $testImageHiddenfilepath;
+
     /**
      * @inheritDoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -139,6 +144,8 @@ protected function setUp(): void
         $this->testfilename = "image.jpg";
         $this->testImageHiddenFilename = "image_hidden.jpg";
         $this->testfilepath = "/image.jpg";
+        $this->testImageHiddenfilepath = "/image_hidden.jpg";
+
 
         $this->appStateMock = $this->createMock(State::class);
         $this->imageConfigMock = $this->createMock(MediaConfig::class);
@@ -167,7 +174,7 @@ protected function setUp(): void
 
         $this->assetImageMock->expects($this->any())
             ->method('getPath')
-            ->willReturn($this->testfilepath);
+            ->willReturnOnConsecutiveCalls($this->testfilepath, $this->testImageHiddenfilepath);
         $this->assetImageFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->assetImageMock);
@@ -189,16 +196,16 @@ protected function setUp(): void
 
         $this->imageConfigMock->expects($this->any())
             ->method('getMediaPath')
-            ->with($this->testfilename)
-            ->willReturn($this->testfilepath);
+            ->withConsecutive([$this->testfilename], [$this->testImageHiddenFilename])
+            ->willReturnOnConsecutiveCalls($this->testfilepath, $this->testImageHiddenfilepath);
         $this->mediaDirectoryMock->expects($this->any())
             ->method('getAbsolutePath')
-            ->with($this->testfilepath)
-            ->willReturn($this->testfilepath);
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath])
+            ->willReturnOnConsecutiveCalls($this->testfilepath, $this->testImageHiddenfilepath);
         $this->mediaDirectoryMock->expects($this->any())
             ->method('getRelativePath')
-            ->with($this->testfilepath)
-            ->willReturn($this->testfilepath);
+            ->willReturnOnConsecutiveCalls($this->testfilepath, $this->testImageHiddenfilepath)
+            ->willReturnOnConsecutiveCalls($this->testfilepath, $this->testImageHiddenfilepath);
 
         $this->viewMock->expects($this->any())
             ->method('getMediaEntities')
@@ -255,7 +262,7 @@ public function testResizeFromThemesMediaStorageDatabase()
             ->willReturn(false);
 
         $imageMock = $this->createMock(Image::class);
-        $this->imageFactoryMock->expects($this->once())
+        $this->imageFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($imageMock);
 
@@ -275,15 +282,15 @@ function () {
 
         $this->mediaDirectoryMock->expects($this->any())
             ->method('isFile')
-            ->with($this->testfilepath)
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath])
             ->willReturn(true);
 
-        $this->databaseMock->expects($this->once())
+        $this->databaseMock->expects($this->any())
             ->method('saveFileToFilesystem')
-            ->with($this->testfilepath);
-        $this->databaseMock->expects($this->once())
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath]);
+        $this->databaseMock->expects($this->any())
             ->method('saveFile')
-            ->with($this->testfilepath);
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath]);
 
         $generator = $this->service->resizeFromThemes(['test-theme'], true);
         while ($generator->valid()) {
@@ -304,7 +311,7 @@ public function testResizeFromThemesHiddenImagesMediaStorageDatabase()
             ->willReturn(false);
 
         $imageMock = $this->createMock(Image::class);
-        $this->imageFactoryMock->expects($this->once())
+        $this->imageFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($imageMock);
 
@@ -338,15 +345,15 @@ function () {
 
         $this->mediaDirectoryMock->expects($this->any())
             ->method('isFile')
-            ->with($this->testfilepath)
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath])
             ->willReturn(true);
 
-        $this->databaseMock->expects($this->once())
+        $this->databaseMock->expects($this->any())
             ->method('saveFileToFilesystem')
-            ->with($this->testfilepath);
-        $this->databaseMock->expects($this->once())
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath]);
+        $this->databaseMock->expects($this->any())
             ->method('saveFile')
-            ->with($this->testfilepath);
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath]);
 
         $this->assertEquals(2, $this->service->getCountProductImages());
         $this->assertEquals(1, $this->service->getCountProductImages(true));
@@ -370,7 +377,7 @@ public function testResizeFromThemesUnsupportedImage()
             ->method('fileExists')
             ->willReturn(false);
 
-        $this->imageFactoryMock->expects($this->once())
+        $this->imageFactoryMock->expects($this->any())
             ->method('create')
             ->willThrowException(new \InvalidArgumentException('Unsupported image format.'));
 
@@ -390,7 +397,7 @@ function () {
 
         $this->mediaDirectoryMock->expects($this->any())
             ->method('isFile')
-            ->with($this->testfilepath)
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath])
             ->willReturn(true);
 
         $generator = $this->service->resizeFromThemes(['test-theme'], true);
@@ -411,13 +418,13 @@ public function testResizeFromImageNameMediaStorageDatabase()
             ->willReturn(false);
 
         $imageMock = $this->createMock(Image::class);
-        $this->imageFactoryMock->expects($this->once())
+        $this->imageFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($imageMock);
 
         $this->mediaDirectoryMock->expects($this->any())
             ->method('isFile')
-            ->with($this->testfilepath)
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath])
             ->willReturnOnConsecutiveCalls(
                 $this->returnValue(false),
                 $this->returnValue(true)
@@ -434,12 +441,12 @@ public function testResizeFromImageNameMediaStorageDatabase()
                 ['0' => []]
             );
 
-        $this->databaseMock->expects($this->once())
+        $this->databaseMock->expects($this->any())
             ->method('saveFileToFilesystem')
-            ->with($this->testfilepath);
-        $this->databaseMock->expects($this->once())
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath]);
+        $this->databaseMock->expects($this->any())
             ->method('saveFile')
-            ->with($this->testfilepath);
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath]);
 
         $this->service->resizeFromImageName($this->testfilename);
     }
@@ -482,7 +489,7 @@ public function testSkipResizingAlreadyResizedImageInDatabase()
 
         $this->mediaDirectoryMock->expects($this->any())
             ->method('isFile')
-            ->with($this->testfilepath)
+            ->withConsecutive([$this->testfilepath], [$this->testImageHiddenfilepath])
             ->willReturnOnConsecutiveCalls(
                 $this->returnValue(false),
                 $this->returnValue(true)