Skip to content

Commit 478916b

Browse files
oshmyheliukoshmyheliuk
committed
B2B-2037: [AWS S3] [Integration Tests]: Investigate Test Failures in MediaGallerySynchronization & MediaGallerySynchronizationMetadata modules
1 parent fecbe46 commit 478916b

File tree

4 files changed

+74
-28
lines changed

4 files changed

+74
-28
lines changed

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

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77

88
namespace Magento\MediaGalleryMetadata\Test\Integration\Model\Gif\Segment;
99

10+
use Magento\Framework\App\Filesystem\DirectoryList;
1011
use Magento\Framework\Exception\LocalizedException;
11-
use Magento\Framework\Filesystem\DriverInterface;
12+
use Magento\Framework\Filesystem;
1213
use Magento\TestFramework\Helper\Bootstrap;
1314
use PHPUnit\Framework\TestCase;
1415
use Magento\MediaGalleryMetadata\Model\Gif\Segment\WriteXmp;
@@ -31,11 +32,6 @@ class XmpTest extends TestCase
3132
*/
3233
private $xmpReader;
3334

34-
/**
35-
* @var DriverInterface
36-
*/
37-
private $driver;
38-
3935
/**
4036
* @var ReadFile
4137
*/
@@ -46,6 +42,11 @@ class XmpTest extends TestCase
4642
*/
4743
private $metadataFactory;
4844

45+
/**
46+
* @var WriteInterface
47+
*/
48+
private $directory;
49+
4950
/**
5051
* @inheritdoc
5152
*/
@@ -54,10 +55,19 @@ protected function setUp(): void
5455
$this->xmpWriter = Bootstrap::getObjectManager()->get(WriteXmp::class);
5556
$this->xmpReader = Bootstrap::getObjectManager()->get(ReadXmp::class);
5657
$this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
57-
$this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
58+
$this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
59+
->getDirectoryWrite(DirectoryList::MEDIA);
5860
$this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
5961
}
6062

63+
/**
64+
* @inheritDoc
65+
*/
66+
protected function tearDown(): void
67+
{
68+
$this->directory->delete('testDir');
69+
}
70+
6171
/**
6272
* Test for XMP reader and writer
6373
*
@@ -74,7 +84,11 @@ public function testWriteReadGif(
7484
string $description,
7585
array $keywords
7686
): void {
77-
$path = realpath(__DIR__ . '/../../../../_files/' . $fileName);
87+
$path = $this->directory->getAbsolutePath('testDir/' . $fileName);
88+
$this->directory->getDriver()->filePutContents(
89+
$path,
90+
file_get_contents(__DIR__ . '/../../../../_files/' . $fileName)
91+
);
7892
$file = $this->fileReader->execute($path);
7993
$originalGifMetadata = $this->xmpReader->execute($file);
8094

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,29 @@ class IptcTest extends TestCase
5151
/**
5252
* @var WriteInterface
5353
*/
54-
private $varDirectory;
54+
private $directory;
5555

5656
/**
5757
* @inheritdoc
5858
*/
5959
protected function setUp(): void
6060
{
61-
$this->varDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
62-
->getDirectoryWrite(DirectoryList::VAR_DIR);
61+
$this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
62+
->getDirectoryWrite(DirectoryList::MEDIA);
6363
$this->iptcWriter = Bootstrap::getObjectManager()->get(WriteIptc::class);
6464
$this->iptcReader = Bootstrap::getObjectManager()->get(ReadIptc::class);
6565
$this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
66-
$this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
6766
$this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
6867
}
6968

69+
/**
70+
* @inheritDoc
71+
*/
72+
protected function tearDown(): void
73+
{
74+
$this->directory->delete('testDir');
75+
}
76+
7077
/**
7178
* Test for IPTC reader and writer
7279
*
@@ -83,13 +90,12 @@ public function testWriteRead(
8390
string $description,
8491
array $keywords
8592
): void {
86-
$path = realpath(__DIR__ . '/../../../../_files/' . $fileName);
87-
$modifiableFilePath = $this->varDirectory->getAbsolutePath($fileName);
88-
$this->driver->copy(
93+
$path = $this->directory->getAbsolutePath('testDir/' . $fileName);
94+
$this->directory->getDriver()->filePutContents(
8995
$path,
90-
$modifiableFilePath
96+
file_get_contents(__DIR__ . '/../../../../_files/' . $fileName)
9197
);
92-
$modifiableFilePath = $this->fileReader->execute($modifiableFilePath);
98+
$modifiableFilePath = $this->fileReader->execute($path);
9399
$originalMetadata = $this->iptcReader->execute($modifiableFilePath);
94100

95101
$this->assertEmpty($originalMetadata->getTitle());

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77

88
namespace Magento\MediaGalleryMetadata\Test\Integration\Model\Jpeg\Segment;
99

10+
use Magento\Framework\App\Filesystem\DirectoryList;
1011
use Magento\Framework\Exception\LocalizedException;
12+
use Magento\Framework\Filesystem;
1113
use Magento\Framework\Filesystem\DriverInterface;
1214
use Magento\TestFramework\Helper\Bootstrap;
1315
use PHPUnit\Framework\TestCase;
@@ -46,6 +48,11 @@ class XmpTest extends TestCase
4648
*/
4749
private $metadataFactory;
4850

51+
/**
52+
* @var WriteInterface
53+
*/
54+
private $directory;
55+
4956
/**
5057
* @inheritdoc
5158
*/
@@ -54,10 +61,19 @@ protected function setUp(): void
5461
$this->xmpWriter = Bootstrap::getObjectManager()->get(WriteXmp::class);
5562
$this->xmpReader = Bootstrap::getObjectManager()->get(ReadXmp::class);
5663
$this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
57-
$this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
64+
$this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
65+
->getDirectoryWrite(DirectoryList::MEDIA);
5866
$this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
5967
}
6068

69+
/**
70+
* @inheritDoc
71+
*/
72+
protected function tearDown(): void
73+
{
74+
$this->directory->delete('testDir');
75+
}
76+
6177
/**
6278
* Test for XMP reader and writer
6379
*
@@ -74,7 +90,11 @@ public function testWriteRead(
7490
string $description,
7591
array $keywords
7692
): void {
77-
$path = realpath(__DIR__ . '/../../../../_files/' . $fileName);
93+
$path = $this->directory->getAbsolutePath('testDir/' . $fileName);
94+
$this->directory->getDriver()->filePutContents(
95+
$path,
96+
file_get_contents(__DIR__ . '/../../../../_files/' . $fileName)
97+
);
7898
$file = $this->fileReader->execute($path);
7999
$originalMetadata = $this->xmpReader->execute($file);
80100

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,29 @@ class XmpTest extends TestCase
5252
/**
5353
* @var WriteInterface
5454
*/
55-
private $varDirectory;
55+
private $directory;
5656

5757
/**
5858
* @inheritdoc
5959
*/
6060
protected function setUp(): void
6161
{
62-
$this->varDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
63-
->getDirectoryWrite(DirectoryList::VAR_DIR);
62+
$this->directory = Bootstrap::getObjectManager()->get(FileSystem::class)
63+
->getDirectoryWrite(DirectoryList::MEDIA);
6464
$this->xmpWriter = Bootstrap::getObjectManager()->get(WriteXmp::class);
6565
$this->xmpReader = Bootstrap::getObjectManager()->get(ReadXmp::class);
6666
$this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
67-
$this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
6867
$this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
6968
}
7069

70+
/**
71+
* @inheritDoc
72+
*/
73+
protected function tearDown(): void
74+
{
75+
$this->directory->delete('testDir');
76+
}
77+
7178
/**
7279
* Test for Xmp reader and writer
7380
*
@@ -84,13 +91,12 @@ public function testWriteRead(
8491
string $description,
8592
array $keywords
8693
): void {
87-
$path = realpath(__DIR__ . '/../../../../_files/' . $fileName);
88-
$modifiableFilePath = $this->varDirectory->getAbsolutePath($fileName);
89-
$this->driver->copy(
94+
$path = $this->directory->getAbsolutePath('testDir/' . $fileName);
95+
$this->directory->getDriver()->filePutContents(
9096
$path,
91-
$modifiableFilePath
97+
file_get_contents(__DIR__ . '/../../../../_files/' . $fileName)
9298
);
93-
$modifiableFilePath = $this->fileReader->execute($modifiableFilePath);
99+
$modifiableFilePath = $this->fileReader->execute($path);
94100
$originalMetadata = $this->xmpReader->execute($modifiableFilePath);
95101

96102
$this->assertEmpty($originalMetadata->getTitle());

0 commit comments

Comments
 (0)