B2B-1754: Automate MC-38938

 - Fixing MFTF generation errors

Author: dhaecker

app/code/Magento/AwsS3/Test/Mftf/Helper/S3FileAssertions.php

@@ -192,6 +192,20 @@ public function assertPathDoesNotExist($path, $message = ''): void
         $this->assertFalse($this->driver->isExists($path), "Failed asserting $path does not exist. " . $message);
     }
 
+    /**
+     * Assert a file does not exist on the remote storage system
+     *
+     * @param string $filePath
+     * @param string $message
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function assertFileDoesNotExist($filePath, $message = ''): void
+    {
+        $this->assertFalse($this->driver->isExists($filePath), $message);
+    }
+
     /**
      * Assert a file on the remote storage system has no contents
      *
@@ -263,22 +277,7 @@ public function assertGlobbedFileContainsString($path, $pattern, $text, $fileInd
      *
      * @throws \Magento\Framework\Exception\FileSystemException
      */
-    public function assertFileDoesNotContainString($filePath, $text, $message = ""): void
-    {
-        $this->assertStringNotContainsString($text, $this->driver->fileGetContents($filePath), $message);
-    }
-
-    /**
-     * Assert a file on the remote storage system does not contain a given string
-     *
-     * @param string $filePath
-     * @param string $text
-     * @param string $message
-     * @return void
-     *
-     * @throws \Magento\Framework\Exception\FileSystemException
-     */
-    public function assertFileDoesNotContain($filePath, $text, $message = ''): void
+    public function assertFileDoesNotContainString($filePath, $text, $message = ''): void
     {
         $this->assertStringNotContainsString($text, $this->driver->fileGetContents($filePath), "Failed asserting $filePath does not contain $text. " . $message);
     }

app/code/Magento/Catalog/Test/Mftf/Helper/LocalFileAssertions.php

@@ -180,6 +180,21 @@ public function assertPathDoesNotExist($path, $message = ''): void
         $this->assertFalse($this->driver->isExists($realPath), "Failed asserting $path does not exist. " . $message);
     }
 
+    /**
+     * Assert a file does not exist
+     *
+     * @param string $filePath
+     * @param string $message
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function assertFileDoesNotExist($filePath, $message = ''): void
+    {
+        $realPath = $this->expandPath($filePath);
+        $this->assertFalse($this->driver->isExists($realPath), $message);
+    }
+
     /**
      * Assert a file has no contents
      *