B2B-2023: [AWS S3] [Integration Tests]: Investigate Test Failures in CatalogImportExport module

Author: oshmyheliuk

app/code/Magento/CustomerImportExport/Test/Unit/Model/Import/CustomerCompositeTest.php

@@ -588,6 +588,10 @@ public function testPrepareRowForDb()
         $directoryMock->expects($this->any())
             ->method('openFile')
             ->willReturn(new Read($pathToCsvFile, new File()));
+        $directoryMock->expects($this->any())
+            ->method('getRelativePath')
+            ->with($pathToCsvFile)
+            ->willReturn($pathToCsvFile);
         $source = new Csv($pathToCsvFile, $directoryMock);
         $modelUnderTest->setSource($source);
         $modelUnderTest->validateData();

app/code/Magento/ImportExport/Test/Unit/Model/Import/Source/CsvTest.php

@@ -40,11 +40,16 @@ protected function setUp(): void
 
     public function testConstructException()
     {
+        $filePath = __DIR__ . '/invalid_file';
         $this->expectException(\LogicException::class);
-        $this->_directoryMock->expects($this->any())
+        $this->_directoryMock->expects($this->once())
+            ->method('getRelativePath')
+            ->with($filePath)
+            ->willReturn($filePath);
+        $this->_directoryMock->expects($this->once())
             ->method('openFile')
             ->willThrowException(new FileSystemException(__('Error message')));
-        new Csv(__DIR__ . '/invalid_file', $this->_directoryMock);
+        new Csv($filePath, $this->_directoryMock);
     }
 
     public function testConstructStream()
@@ -56,9 +61,9 @@ public function testConstructStream()
         )->method(
             'openFile'
         )->willReturn(
-            
-                new Read($stream, new Http())
-            
+
+            new Read($stream, new Http())
+
         );
         $this->_filesystem->expects(
             $this->any()
@@ -82,18 +87,16 @@ public function testConstructStream()
      */
     public function testOptionalArgs($delimiter, $enclosure, $expectedColumns)
     {
-        $this->_directoryMock->expects(
-            $this->any()
-        )->method(
-            'openFile'
-        )->willReturn(
-            new Read(
-                __DIR__ . '/_files/test.csv',
-                new File()
-            )
-        );
+        $filePath = __DIR__ . '/_files/test.csv';
+        $this->_directoryMock->expects($this->once())
+            ->method('getRelativePath')
+            ->with($filePath)
+            ->willReturn($filePath);
+        $this->_directoryMock->expects($this->any())
+            ->method('openFile')
+            ->willReturn(new Read($filePath, new File()));
         $model = new Csv(
-            __DIR__ . '/_files/test.csv',
+            $filePath,
             $this->_directoryMock,
             $delimiter,
             $enclosure
@@ -117,20 +120,15 @@ public function testRewind()
     {
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('wrongColumnsNumber');
-        $this->_directoryMock->expects(
-            $this->any()
-        )->method(
-            'openFile'
-        )->willReturn(
-            new Read(
-                __DIR__ . '/_files/test.csv',
-                new File()
-            )
-        );
-        $model = new Csv(
-            __DIR__ . '/_files/test.csv',
-            $this->_directoryMock
-        );
+        $filePath = __DIR__ . '/_files/test.csv';
+        $this->_directoryMock->expects($this->once())
+            ->method('getRelativePath')
+            ->with($filePath)
+            ->willReturn($filePath);
+        $this->_directoryMock->expects($this->any())
+            ->method('openFile')
+            ->willReturn(new Read($filePath, new File()));
+        $model = new Csv($filePath, $this->_directoryMock);
         $this->assertSame(-1, $model->key());
         $model->next();
         $this->assertSame(0, $model->key());

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithNotExistImagesTest.php

@@ -18,7 +18,6 @@
 use Magento\Framework\MessageQueue\MessageEncoder;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\ImportExport\Model\Export\Consumer;
-use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import as ImportModel;
 use Magento\ImportExport\Model\Import\Source\Csv as CsvSource;
 use Magento\ImportExport\Model\Import\Source\CsvFactory;
@@ -134,7 +133,7 @@ public function testImportWithUnexistingImages(): void
         $this->import->setParameters([
             'entity' => Product::ENTITY,
             'behavior' => ImportModel::BEHAVIOR_ADD_UPDATE,
-            Import::FIELD_NAME_IMG_FILE_DIR => $mediaDirectory->getAbsolutePath('import')
+            ImportModel::FIELD_NAME_IMG_FILE_DIR => $mediaDirectory->getAbsolutePath('import')
         ]);
         $this->assertImportErrors();
         $this->assertProductImages('/m/a/magento_image.jpg', 'simple');

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/media_import_image.php

@@ -14,4 +14,7 @@
 $dirPath = $mediaDirectory->getAbsolutePath('import/m/a');
 $driver = $mediaDirectory->getDriver();
 $driver->createDirectory($dirPath);
-$driver->filePutContents($dirPath . '/magento_image.jpg', file_get_contents(__DIR__ . '/../../../../../Magento/Catalog/_files/magento_image.jpg'));
+$driver->filePutContents(
+    $dirPath . '/magento_image.jpg',
+    file_get_contents(__DIR__ . '/../../../../../Magento/Catalog/_files/magento_image.jpg')
+);