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

Author: oshmyheliuk

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

@@ -50,7 +50,6 @@ class ReadFile implements ReadFileInterface
      * @param FileInterfaceFactory $fileFactory
      * @param SegmentInterfaceFactory $segmentFactory
      * @param Filesystem $filesystem
-     * @throws FileSystemException
      */
     public function __construct(
         FileInterfaceFactory $fileFactory,
@@ -60,19 +59,18 @@ public function __construct(
         $this->fileFactory = $fileFactory;
         $this->segmentFactory = $segmentFactory;
         $this->filesystem = $filesystem;
-        $this->driver = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA)->getDriver();
     }
 
     /**
      * @inheritdoc
      */
     public function execute(string $path): FileInterface
     {
-        $resource = $this->driver->fileOpen($path, 'rb');
+        $resource = $this->getDriver()->fileOpen($path, 'rb');
         $header = $this->readHeader($resource);
 
         if ($header != self::PNG_FILE_START) {
-            $this->driver->fileClose($resource);
+            $this->getDriver()->fileClose($resource);
             throw new ValidatorException(__('Not a PNG image'));
         }
 
@@ -92,10 +90,10 @@ public function execute(string $path): FileInterface
             }
         } while ($header
             && $segmentHeader['type'] != self::PNG_MARKER_IMAGE_END
-            && !$this->driver->endOfFile($resource)
+            && !$this->getDriver()->endOfFile($resource)
         );
 
-        $this->driver->fileClose($resource);
+        $this->getDriver()->fileClose($resource);
 
         return $this->fileFactory->create([
             'path' => $path,
@@ -127,10 +125,24 @@ private function read($resource, int $length): string
     {
         $data = '';
 
-        while (!$this->driver->endOfFile($resource) && strlen($data) < $length) {
-            $data .= $this->driver->fileRead($resource, $length - strlen($data));
+        while (!$this->getDriver()->endOfFile($resource) && strlen($data) < $length) {
+            $data .= $this->getDriver()->fileRead($resource, $length - strlen($data));
         }
 
         return $data;
     }
+
+
+    /**
+     * @return DriverInterface
+     * @throws FileSystemException
+     */
+    private function getDriver(): DriverInterface
+    {
+        if ($this->driver === null) {
+            $this->driver = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA)->getDriver();
+        }
+
+        return $this->driver;
+    }
 }

app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/AddMetadataTest.php

@@ -48,10 +48,19 @@ class AddMetadataTest extends TestCase
     protected function setUp(): void
     {
         $this->addMetadata = Bootstrap::getObjectManager()->get(AddMetadataInterface::class);
-        $this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
-            ->getDirectoryWrite(DirectoryList::MEDIA);
         $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataInterfaceFactory::class);
         $this->extractMetadata = Bootstrap::getObjectManager()->get(ExtractMetadataInterface::class);
+        $this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
+            ->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->directory->create('testDir');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        $this->directory->delete('testDir');
     }
 
     /**
@@ -70,7 +79,7 @@ public function testExecute(
         ?string $description,
         ?array $keywords
     ): void {
-        $modifiableFilePath = $this->directory->getAbsolutePath($fileName);
+        $modifiableFilePath = $this->directory->getAbsolutePath('testDir/' . $fileName);
         $driver = $this->directory->getDriver();
         $driver->filePutContents(
             $modifiableFilePath,

app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php

@@ -7,7 +7,10 @@
 
 namespace Magento\MediaGalleryMetadata\Test\Integration\Model;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
@@ -22,12 +25,28 @@ class ExtractMetadataTest extends TestCase
      */
     private $extractMetadata;
 
+    /**
+     * @var WriteInterface
+     */
+    private $directory;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         $this->extractMetadata = Bootstrap::getObjectManager()->get(ExtractMetadataInterface::class);
+        $this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
+            ->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->directory->create('testDir');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        $this->directory->delete('testDir');
     }
 
     /**
@@ -46,7 +65,13 @@ public function testExecute(
         string $description,
         ?array $keywords
     ): void {
-        $path = realpath(__DIR__ . '/../../_files/' . $fileName);
+        $path = $this->directory->getAbsolutePath('testDir/' . $fileName);
+        $driver = $this->directory->getDriver();
+        $driver->filePutContents(
+            $path,
+            file_get_contents(__DIR__ . '/../../_files/' . $fileName)
+        );
+
         $metadata = $this->extractMetadata->execute($path);
 
         $this->assertEquals($title, $metadata->getTitle());

app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Gif/Segment/XmpTest.php

@@ -58,6 +58,7 @@ protected function setUp(): void
         $this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
             ->getDirectoryWrite(DirectoryList::MEDIA);
         $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
+        $this->directory->create('testDir');
     }
 
     /**

app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/IptcTest.php

@@ -59,6 +59,7 @@ protected function setUp(): void
         $this->iptcReader = Bootstrap::getObjectManager()->get(ReadIptc::class);
         $this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
         $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
+        $this->directory->create('testDir');
     }
 
     /**

app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/XmpTest.php

@@ -59,6 +59,7 @@ protected function setUp(): void
         $this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
             ->getDirectoryWrite(DirectoryList::MEDIA);
         $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
+        $this->directory->create('testDir');
     }
 
     /**

app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Png/Segment/IptcTest.php

@@ -51,20 +51,29 @@ class IptcTest extends TestCase
     /**
      * @var WriteInterface
      */
-    private $varDirectory;
+    private $directory;
 
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->varDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
-            ->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
+            ->getDirectoryWrite(DirectoryList::MEDIA);
         $this->iptcWriter = Bootstrap::getObjectManager()->get(WriteIptc::class);
         $this->iptcReader = Bootstrap::getObjectManager()->get(ReadIptc::class);
         $this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
-        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+        $this->driver = $this->directory->getDriver();
         $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
+        $this->directory->create('testDir');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        $this->directory->delete('testDir');
     }
 
     /**
@@ -83,13 +92,12 @@ public function testWriteRead(
         string $description,
         array $keywords
     ): void {
-        $path = realpath(__DIR__ . '/../../../../_files/' . $fileName);
-        $modifiableFilePath = $this->varDirectory->getAbsolutePath($fileName);
-        $this->driver->copy(
+        $path = $this->directory->getAbsolutePath('testDir/' . $fileName);
+        $this->driver->filePutContents(
             $path,
-            $modifiableFilePath
+            file_get_contents(__DIR__ . '/../../../../_files/' . $fileName)
         );
-        $modifiableFilePath = $this->fileReader->execute($modifiableFilePath);
+        $modifiableFilePath = $this->fileReader->execute($path);
         $originalMetadata = $this->iptcReader->execute($modifiableFilePath);
 
         $this->assertEmpty($originalMetadata->getTitle());

app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Png/Segment/XmpTest.php

@@ -65,6 +65,7 @@ protected function setUp(): void
         $this->xmpReader = Bootstrap::getObjectManager()->get(ReadXmp::class);
         $this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
         $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
+        $this->directory->create('testDir');
     }
 
     /**

app/code/Magento/RemoteStorage/Driver/Adapter/Cache/Generic.php

@@ -194,7 +194,7 @@ public function getMetadata(string $path): ?array
                 return null;
             }
             $meta = $this->serializer->unserialize($meta);
-            if (!$meta[$path]) {
+            if (!isset($meta[$path]) || !$meta[$path]) {
                 return null;
             }
             $this->cacheData[$path] = $meta[$path];