B2B:2037:[AWS S3] [Integration Tests]: Investigate Test Failures in MediaGallerySynchronization & MediaGallerySynchronizationMetadata modules

- Added review fixes

Author: avattam06

app/code/Magento/MediaGalleryMetadata/Model/Gif/ReadFile.php

@@ -11,7 +11,6 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem\DriverInterface;
-use Magento\MediaGalleryMetadata\Model\SegmentNames;
 use Magento\MediaGalleryMetadataApi\Model\FileInterface;
 use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
 use Magento\MediaGalleryMetadataApi\Model\ReadFileInterface;
@@ -45,26 +44,19 @@ class ReadFile implements ReadFileInterface
      */
     private $fileFactory;
 
-    /**
-     * @var SegmentNames
-     */
-    private $segmentNames;
-
     /**
      * @param FileInterfaceFactory $fileFactory
      * @param SegmentInterfaceFactory $segmentFactory
-     * @param SegmentNames $segmentNames
      * @param Filesystem $filesystem
+     * @throws FileSystemException
      */
     public function __construct(
         FileInterfaceFactory $fileFactory,
         SegmentInterfaceFactory $segmentFactory,
-        SegmentNames $segmentNames,
         Filesystem $filesystem
     ) {
         $this->fileFactory = $fileFactory;
         $this->segmentFactory = $segmentFactory;
-        $this->segmentNames = $segmentNames;
         $this->filesystem = $filesystem;
         $this->driver = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA)->getDriver();
     }

app/code/Magento/MediaGalleryMetadata/Model/Png/ReadFile.php

@@ -50,6 +50,7 @@ class ReadFile implements ReadFileInterface
      * @param FileInterfaceFactory $fileFactory
      * @param SegmentInterfaceFactory $segmentFactory
      * @param Filesystem $filesystem
+     * @throws FileSystemException
      */
     public function __construct(
         FileInterfaceFactory $fileFactory,

app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php

@@ -83,7 +83,6 @@ public function testExecute(
 
         $this->assertEquals($title, pathinfo($loadedAsset->getTitle(), PATHINFO_FILENAME));
         $this->assertEquals($source, $loadedAsset->getSource());
-        $this->driver->deleteFile($modifiableFilePath);
     }
 
     /**
@@ -101,4 +100,12 @@ public function filesProvider(): array
             ]
         ];
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function tearDown(): void
+    {
+        $this->mediaDirectory->getDriver()->deleteFile($this->mediaDirectory->getAbsolutePath());
+    }
 }

dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/Model/SynchronizeFilesTest.php

@@ -95,8 +95,6 @@ public function testExecute(
         $this->assertEquals($title, pathinfo($loadedAssets->getTitle(), PATHINFO_FILENAME));
         $this->assertEquals($description, $loadedAssets->getDescription());
         $this->assertEquals($keywords, $loadedKeywords);
-
-        $this->driver->deleteFile($modifiableFilePath);
     }
 
     /**
@@ -148,4 +146,12 @@ function (KeywordInterface $keyword) {
             $keywords
         );
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function tearDown(): void
+    {
+        $this->mediaDirectory->getDriver()->deleteFile($this->mediaDirectory->getAbsolutePath());
+    }
 }