B2B-2022:[AWS S3] [Integration Tests]: Investigate Test Failures in Catalog module

- Added more review fixes

Author: avattam06

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php

@@ -87,9 +87,9 @@ public function testUploadAction(array $file, array $expectation): void
         $this->assertEquals($jsonBody['url'], $expectation['url']);
         $this->assertArrayNotHasKey('error', $jsonBody);
         $this->assertArrayNotHasKey('errorcode', $jsonBody);
-        $this->mediaDirectory->isExist(
+        $this->assertTrue($this->mediaDirectory->isExist(
             $this->getFileAbsolutePath($expectation['tmp_media_path'])
-        );
+        ));
     }
 
     /**
@@ -286,6 +286,6 @@ private function createFileInSysTmpDir(string $name): void
      */
     private function getFileAbsolutePath(string $tmpPath): string
     {
-        return $this->mediaDirectory->getAbsolutePath($this->config->getBaseTmpMediaPath(). $tmpPath);
+        return $this->mediaDirectory->getAbsolutePath($this->config->getBaseTmpMediaPath() . $tmpPath);
     }
 }

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Save/ImagesTest.php

@@ -138,7 +138,8 @@ private function assertSuccessfulImageSave(array $expectation): void
         $this->assertEquals($expectation['small_image'], $product->getData('small_image'));
         $this->assertEquals($expectation['thumbnail'], $product->getData('thumbnail'));
         $this->assertEquals($expectation['swatch_image'], $product->getData('swatch_image'));
-        $pathExpected = $this->mediaDirectory->getAbsolutePath() . $expectation['image'];
-        $this->mediaDirectory->isExist($pathExpected);
+        $this->assertFileExists(
+            $this->mediaDirectory->getAbsolutePath($this->config->getBaseMediaPath() . $expectation['image'])
+        );
     }
 }

lib/internal/Magento/Framework/Filesystem/Directory/Write.php

@@ -113,7 +113,7 @@ public function renameFile($path, $newPath, WriteInterface $targetDirectory = nu
     {
         $this->validatePath($path);
         $this->validatePath($newPath);
-        $this->isFile($path);
+        $this->assertIsFile($path);
         $targetDirectory = $targetDirectory ?: $this;
         if (!$targetDirectory->isExist($this->driver->getParentDirectory($newPath))) {
             $targetDirectory->create($this->driver->getParentDirectory($newPath));