Merge branch 'B2B-2031' into B2B-2069

Author: NadiyaS

dev/tests/integration/testsuite/Magento/MediaGallery/Model/Directory/Command/CreateByPathsTest.php

@@ -19,6 +19,8 @@
 
 /**
  * Test for CreateDirectoriesByPathsInterface
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CreateByPathsTest extends \PHPUnit\Framework\TestCase
 {
@@ -38,6 +40,9 @@ class CreateByPathsTest extends \PHPUnit\Framework\TestCase
     /**
      * Absolute path to the media directory
      */
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\ReadInterface
+     */
     private $mediaDirectoryPath;
 
     /**
@@ -106,9 +111,9 @@ protected function tearDown(): void
     public function testCreateDirectory(): void
     {
         $this->createByPaths->execute([self::TEST_DIRECTORY_NAME]);
-        $this->assertFileExists($this->mediaDirectoryPath . self::TEST_DIRECTORY_NAME);
+        $this->assertTrue($this->mediaDirectory->isExist($this->mediaDirectoryPath . self::TEST_DIRECTORY_NAME));
         $this->deleteByPaths->execute([self::TEST_DIRECTORY_NAME]);
-        $this->assertFileDoesNotExist($this->mediaDirectoryPath . self::TEST_DIRECTORY_NAME);
+        $this->assertFalse($this->mediaDirectory->isExist($this->mediaDirectoryPath . self::TEST_DIRECTORY_NAME));
     }
 
     /**
@@ -152,11 +157,11 @@ public function testCreateChildDirectoryTheSameNameAsParentDirectory(): void
         $childPath = $dir . '/testCreateDirectory';
 
         $this->createByPaths->execute([$dir]);
-        $this->assertFileExists($this->mediaDirectoryPath . $dir);
+        $this->assertTrue($this->mediaDirectory->isExist($this->mediaDirectoryPath . $dir));
         $this->createByPaths->execute([$childPath]);
-        $this->assertFileExists($this->mediaDirectoryPath . $childPath);
+        $this->assertTrue($this->mediaDirectory->isExist($this->mediaDirectoryPath . $childPath));
         $this->deleteByPaths->execute([$dir]);
-        $this->assertFileDoesNotExist($this->mediaDirectoryPath . $dir);
+        $this->assertFalse($this->mediaDirectory->isExist($this->mediaDirectoryPath . $dir));
     }
 
     /**
@@ -167,7 +172,7 @@ public function testCreateDirectoryThatAlreadyExist(): void
         $this->expectException(CouldNotSaveException::class);
 
         $this->createByPaths->execute([self::TEST_DIRECTORY_NAME]);
-        $this->assertFileExists($this->mediaDirectoryPath . self::TEST_DIRECTORY_NAME);
+        $this->assertTrue($this->mediaDirectory->isExist($this->mediaDirectoryPath . self::TEST_DIRECTORY_NAME));
         $this->createByPaths->execute([self::TEST_DIRECTORY_NAME]);
     }
 

dev/tests/integration/testsuite/Magento/MediaGallery/Model/Directory/Command/DeleteByPathsTest.php

@@ -79,9 +79,9 @@ public function testDeleteDirectory(): void
         $mediaDirectory->create($this->testDirectoryName);
         $mediaDirectory->create($testDir);
         $fullPath = $mediaDirectory->getAbsolutePath($testDir);
-        $this->assertFileExists($fullPath);
+        $this->assertTrue($mediaDirectory->isExist($fullPath));
         $this->deleteByPaths->execute([$testDir]);
-        $this->assertFileDoesNotExist($fullPath);
+        $this->assertFalse($mediaDirectory->isExist($fullPath));
     }
 
     /**